From owner-p4-projects@FreeBSD.ORG Wed Nov 1 16:52:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA73916A416; Wed, 1 Nov 2006 16:52:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C003016A403 for ; Wed, 1 Nov 2006 16:52:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88E6C43D49 for ; Wed, 1 Nov 2006 16:52:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA1GqR7g087646 for ; Wed, 1 Nov 2006 16:52:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA1GqKgZ087639 for perforce@freebsd.org; Wed, 1 Nov 2006 16:52:20 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Nov 2006 16:52:20 GMT Message-Id: <200611011652.kA1GqKgZ087639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 108925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2006 16:52:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=108925 Change 108925 by jhb@jhb_mutex on 2006/11/01 16:51:48 IFC @108920. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#58 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#68 integrate .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#55 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#52 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#36 integrate .. //depot/projects/smpng/sys/amd64/include/asmacros.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/profile.h#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#22 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#9 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#26 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#23 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#11 integrate .. //depot/projects/smpng/sys/arm/at91/std.at91#3 integrate .. //depot/projects/smpng/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#2 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#12 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#5 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#10 integrate .. //depot/projects/smpng/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#12 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#7 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#7 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#6 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#21 integrate .. //depot/projects/smpng/sys/boot/arm/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootiic/loader_prompt.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/main.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200.h#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.h#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/mci_device.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/p_string.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/smpng/sys/boot/common/help.common#21 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#15 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#41 integrate .. //depot/projects/smpng/sys/boot/forth/support.4th#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#30 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf32_freebsd.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf64_freebsd.c#6 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#70 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#34 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#34 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#34 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#34 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#39 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#51 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#33 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#72 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.h#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#34 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#58 integrate .. //depot/projects/smpng/sys/conf/NOTES#128 integrate .. //depot/projects/smpng/sys/conf/files#188 integrate .. //depot/projects/smpng/sys/conf/files.amd64#48 integrate .. //depot/projects/smpng/sys/conf/files.i386#103 integrate .. //depot/projects/smpng/sys/conf/files.ia64#57 integrate .. //depot/projects/smpng/sys/conf/files.pc98#85 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#33 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#57 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#57 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#54 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#61 integrate .. //depot/projects/smpng/sys/conf/options#127 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#24 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#8 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#37 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#19 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_aiboost.c#1 branch .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#5 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#13 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#17 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#14 integrate .. //depot/projects/smpng/sys/dev/aic/aic.c#9 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#16 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#43 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#17 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#19 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#61 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#28 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#80 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#47 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#16 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#74 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#36 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#20 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#20 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#19 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#38 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#16 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#46 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#20 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwireg.h#9 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#27 integrate .. //depot/projects/smpng/sys/dev/mmc/bridge.h#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmc.c#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcreg.h#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcsd.c#1 branch .. //depot/projects/smpng/sys/dev/mmc/mmcvar.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#74 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#20 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#39 integrate .. //depot/projects/smpng/sys/dev/spibus/spibus.c#2 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#23 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#7 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#43 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#58 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#95 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#19 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#20 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#24 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#59 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#13 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#8 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#16 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#27 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#35 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#10 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#25 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#9 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#16 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#16 integrate .. //depot/projects/smpng/sys/geom/geom.h#49 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#48 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#6 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#43 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#35 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/smpng/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/smpng/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#35 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#36 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#16 integrate .. //depot/projects/smpng/sys/i386/acpica/Makefile#8 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#83 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#125 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#32 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#117 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#108 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#22 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#103 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#30 integrate .. //depot/projects/smpng/sys/i386/include/asmacros.h#7 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#17 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#37 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#36 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#35 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#36 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#42 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#54 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#26 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#28 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#105 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#81 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.S#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#91 integrate .. //depot/projects/smpng/sys/kern/init_main.c#62 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#119 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#102 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#127 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#105 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#27 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#41 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#15 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#61 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#69 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_fattime.c#1 branch .. //depot/projects/smpng/sys/kern/subr_prf.c#48 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#81 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#47 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#56 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#56 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#25 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#77 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#84 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#4 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#31 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#44 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#36 integrate .. //depot/projects/smpng/sys/kern/tty.c#66 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#35 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#49 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#20 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#94 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#94 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#68 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#75 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#134 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#117 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#75 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#29 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_aiboost/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aio/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#18 integrate .. //depot/projects/smpng/sys/modules/mem/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/mmc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/uart/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/ufs/Makefile#4 integrate .. //depot/projects/smpng/sys/net/bpf.c#64 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#13 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#4 integrate .. //depot/projects/smpng/sys/net/bsd_comp.c#11 integrate .. //depot/projects/smpng/sys/net/if.c#87 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#22 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#38 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#13 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#76 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#28 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#14 integrate .. //depot/projects/smpng/sys/net/if_gif.c#39 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#25 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#42 integrate .. //depot/projects/smpng/sys/net/if_stf.c#39 integrate .. //depot/projects/smpng/sys/net/if_tun.c#48 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#20 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#15 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#12 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#27 integrate .. //depot/projects/smpng/sys/netgraph/ng_message.h#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.h#4 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#51 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#18 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#68 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#50 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#45 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#78 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#40 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#80 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#48 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#2 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#87 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#61 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#91 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#84 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#53 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#71 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#16 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#27 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#47 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#62 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#48 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#29 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#29 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#66 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#58 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#17 integrate .. //depot/projects/smpng/sys/pci/agp.c#28 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#61 integrate .. //depot/projects/smpng/sys/pci/ncr.c#22 integrate .. //depot/projects/smpng/sys/pci/nfsmb.c#4 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#20 integrate .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#5 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#39 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#26 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#70 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#60 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#15 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#14 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#31 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#74 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/sparc64/include/endian.h#15 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#38 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#81 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#75 integrate .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/smpng/sys/sys/bio.h#28 integrate .. //depot/projects/smpng/sys/sys/clock.h#4 integrate .. //depot/projects/smpng/sys/sys/conf.h#46 integrate .. //depot/projects/smpng/sys/sys/cons.h#11 integrate .. //depot/projects/smpng/sys/sys/elf32.h#5 integrate .. //depot/projects/smpng/sys/sys/elf64.h#6 integrate .. //depot/projects/smpng/sys/sys/mac.h#37 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#39 integrate .. //depot/projects/smpng/sys/sys/mount.h#55 integrate .. //depot/projects/smpng/sys/sys/param.h#105 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#16 integrate .. //depot/projects/smpng/sys/sys/proc.h#172 integrate .. //depot/projects/smpng/sys/sys/queue.h#18 integrate .. //depot/projects/smpng/sys/sys/rtprio.h#6 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#5 integrate .. //depot/projects/smpng/sys/sys/sched.h#23 integrate .. //depot/projects/smpng/sys/sys/sem.h#8 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#12 integrate .. //depot/projects/smpng/sys/sys/syscall.h#76 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#76 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#80 integrate .. //depot/projects/smpng/sys/sys/systm.h#74 integrate .. //depot/projects/smpng/sys/sys/umtx.h#17 integrate .. //depot/projects/smpng/sys/sys/vnode.h#74 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#22 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#58 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#89 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/smpng/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#25 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#58 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#22 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#14 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#65 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#66 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#82 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#60 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#87 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#84 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#36 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#31 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#61 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $"); #include #include @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - printf("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly.\n"); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.76 2006/10/20 09:44:20 bde Exp $"); #include #include @@ -91,6 +91,7 @@ { "r15", DB_OFFSET(tf_r15), db_frame }, { "rip", DB_OFFSET(tf_rip), db_frame }, { "rflags", DB_OFFSET(tf_rflags), db_frame }, +#define DB_N_SHOW_REGS 20 /* Don't show registers after here. */ { "dr0", NULL, db_dr0 }, { "dr1", NULL, db_dr1 }, { "dr2", NULL, db_dr2 }, @@ -100,7 +101,7 @@ { "dr6", NULL, db_dr6 }, { "dr7", NULL, db_dr7 }, }; -struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +struct db_variable *db_eregs = db_regs + DB_N_SHOW_REGS; #define DB_DRX_FUNC(reg) \ static int \ ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.157 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,6 +185,7 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); +ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.21 2006/10/10 23:23:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $ */ /* @@ -56,6 +56,14 @@ #include #endif +#ifndef DEV_ATPIC +#include +#include +#include +#include +#include +#endif + #define MAX_STRAY_LOG 5 typedef void (*mask_fn)(void *); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#58 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.655 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -125,9 +125,11 @@ #include #endif -#include +#ifdef DEV_ATPIC #include +#else #include +#endif #include #include @@ -1118,7 +1120,11 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#68 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.572 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1665,7 +1665,7 @@ vm_page_t m; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.24 2005/05/14 09:10:00 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.28 2006/10/29 09:48:44 bde Exp $"); #ifdef GUPROF #if 0 @@ -37,20 +37,15 @@ #include #include #include +#include #include #include #if 0 #include #endif -#include -#undef MCOUNT -#endif - -#include #include -#ifdef GUPROF #define CPUTIME_CLOCK_UNINITIALIZED 0 #define CPUTIME_CLOCK_I8254 1 #define CPUTIME_CLOCK_TSC 2 @@ -60,7 +55,7 @@ int cputime_bias = 1; /* initialize for locality of reference */ static int cputime_clock = CPUTIME_CLOCK_UNINITIALIZED; -#ifdef I586_PMC_GUPROF +#if defined(PERFMON) && defined(I586_PMC_GUPROF) static u_int cputime_clock_pmc_conf = I586_PMC_GUPROF; static int cputime_clock_pmc_init; static struct gmonparam saved_gmp; @@ -80,7 +75,7 @@ # \n\ # Check that we are profiling. Do it early for speed. \n\ # \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # __mcount is the same as [.]mcount except the caller \n\ @@ -98,11 +93,11 @@ jmp .got_frompc \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mcount)) " \n\ -" __XSTRING(HIDENAME(mcount)) ": \n\ + .globl .mcount \n\ +.mcount: \n\ .globl __cyg_profile_func_enter \n\ __cyg_profile_func_enter: \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # The caller's stack frame has already been built, so \n\ @@ -126,7 +121,7 @@ \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mcount)) " \n\ + call mcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ @@ -139,7 +134,7 @@ ret \n\ "); #else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler +#error "this file needs to be ported to your compiler" #endif /* __GNUCLIKE_ASM */ #ifdef GUPROF @@ -164,11 +159,11 @@ GMON_PROF_HIRES = 4 \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ + .globl .mexitcount \n\ +.mexitcount: \n\ .globl __cyg_profile_func_exit \n\ __cyg_profile_func_exit: \n\ - cmpl $GMON_PROF_HIRES," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\ jne .mexitcount_exit \n\ pushq %rax \n\ pushq %rdx \n\ @@ -180,7 +175,7 @@ movq 7*8(%rsp),%rdi \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mexitcount)) " \n\ + call mexitcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ @@ -192,8 +187,6 @@ .mexitcount_exit: \n\ ret \n\ "); -#else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler #endif /* __GNUCLIKE_ASM */ /* @@ -212,7 +205,6 @@ u_char high, low; static u_int prev_count; -#ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) { /* * Scale the TSC a little to make cputime()'s frequency @@ -226,7 +218,7 @@ prev_count = count; return (delta); } -#if defined(PERFMON) && defined(I586_PMC_GUPROF) +#if defined(PERFMON) && defined(I586_PMC_GUPROF) && !defined(SMP) if (cputime_clock == CPUTIME_CLOCK_I586_PMC) { /* * XXX permon_read() should be inlined so that the @@ -240,8 +232,7 @@ prev_count = count; return (delta); } -#endif /* PERFMON && I586_PMC_GUPROF */ -#endif /* !SMP */ +#endif /* PERFMON && I586_PMC_GUPROF && !SMP */ /* * Read the current value of the 8254 timer counter 0. @@ -323,13 +314,10 @@ { if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) { cputime_clock = CPUTIME_CLOCK_I8254; -#ifndef SMP - if (tsc_freq != 0) + if (tsc_freq != 0 && !tsc_is_broken && mp_ncpus < 2) cputime_clock = CPUTIME_CLOCK_TSC; -#endif } gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; -#ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) gp->profrate = tsc_freq >> 1; #if defined(PERFMON) && defined(I586_PMC_GUPROF) @@ -358,7 +346,6 @@ } } #endif /* PERFMON && I586_PMC_GUPROF */ -#endif /* !SMP */ cputime_bias = 0; cputime(); } @@ -375,17 +362,4 @@ } #endif } - -#else /* !GUPROF */ -#ifdef __GNUCLIKE_ASM -__asm(" \n\ - .text \n\ - .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ - ret \n\ -"); -#else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler -#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ ==== //depot/projects/smpng/sys/amd64/amd64/support.S#17 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.120 2006/08/28 02:28:14 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ */ #include "opt_ddb.h" @@ -342,10 +342,10 @@ ret /* - * casuptr. Compare and set user pointer. Returns -1 or the current value. + * casuword. Compare and set user word. Returns -1 or the current value. * dst = %rdi, old = %rsi, new = %rdx */ -ENTRY(casuptr) +ENTRY(casuword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#55 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); /* * AMD64 Trap and System call handling @@ -299,8 +299,10 @@ case T_PAGEFLT: /* page fault */ addr = frame.tf_addr; +#ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); +#endif i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; @@ -757,8 +759,10 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); +#ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); +#endif params = (caddr_t)frame.tf_rsp + sizeof(register_t); code = frame.tf_rax; orig_tf_rflags = frame.tf_rflags; ==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ machine amd64 @@ -14,3 +14,6 @@ # UART chips on this platform device uart_ns8250 + +# KSE support went from being default to a kernel option +options KSE ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#52 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.468 2006/10/26 22:11:34 jb Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -11,7 +11,6 @@ hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" -hint.atkbd.0.flags="0x1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" hint.vga.0.at="isa" ==== //depot/projects/smpng/sys/amd64/conf/NOTES#36 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.59 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.63 2006/10/23 13:23:13 ru Exp $ # # @@ -103,7 +103,7 @@ # # sio: serial ports (see sio(4)), including support for various -# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# PC Card devices, such as Modem and NICs # device sio hint.sio.0.at="isa" @@ -202,6 +202,61 @@ # Optional devices: # +# PS/2 mouse +device psm +hint.psm.0.at="atkbdc" +hint.psm.0.irq="12" + +# Options for psm: +options PSM_HOOKRESUME #hook the system resume event, useful + #for some laptops +options PSM_RESETAFTERSUSPEND #reset the device at the resume event + +# The keyboard controller; it controls the keyboard and the PS/2 mouse. +device atkbdc +hint.atkbdc.0.at="isa" +hint.atkbdc.0.port="0x060" + >>> TRUNCATED FOR MAIL (1000 lines) <<<