PERFORCE change 102695 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Jul 29 00:40:23 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102695
Change 102695 by marcel at marcel_nfs on 2006/07/29 00:39:58
IFC @102694
Affected files ...
.. //depot/projects/uart/amd64/amd64/db_trace.c#11 integrate
.. //depot/projects/uart/amd64/amd64/identcpu.c#10 integrate
.. //depot/projects/uart/amd64/amd64/intr_machdep.c#9 integrate
.. //depot/projects/uart/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/uart/amd64/amd64/machdep.c#21 integrate
.. //depot/projects/uart/amd64/amd64/pmap.c#41 integrate
.. //depot/projects/uart/amd64/amd64/trap.c#13 integrate
.. //depot/projects/uart/amd64/amd64/vm_machdep.c#12 integrate
.. //depot/projects/uart/amd64/conf/GENERIC#23 integrate
.. //depot/projects/uart/amd64/ia32/ia32_syscall.c#9 integrate
.. //depot/projects/uart/amd64/include/specialreg.h#6 integrate
.. //depot/projects/uart/amd64/linux32/linux32_proto.h#9 integrate
.. //depot/projects/uart/amd64/linux32/linux32_syscall.h#9 integrate
.. //depot/projects/uart/amd64/linux32/linux32_sysent.c#9 integrate
.. //depot/projects/uart/amd64/linux32/syscalls.master#9 integrate
.. //depot/projects/uart/arm/arm/db_trace.c#7 integrate
.. //depot/projects/uart/arm/arm/gdb_machdep.c#1 branch
.. //depot/projects/uart/arm/arm/in_cksum.c#7 integrate
.. //depot/projects/uart/arm/arm/pmap.c#18 integrate
.. //depot/projects/uart/arm/arm/trap.c#13 integrate
.. //depot/projects/uart/arm/arm/vm_machdep.c#12 integrate
.. //depot/projects/uart/arm/at91/at91_pio.c#3 integrate
.. //depot/projects/uart/arm/at91/at91_piovar.h#2 integrate
.. //depot/projects/uart/arm/at91/at91_pmc.c#3 integrate
.. //depot/projects/uart/arm/at91/at91_rtc.c#2 integrate
.. //depot/projects/uart/arm/at91/at91_rtcreg.h#2 integrate
.. //depot/projects/uart/arm/at91/at91_spi.c#2 integrate
.. //depot/projects/uart/arm/at91/at91_spiio.h#2 delete
.. //depot/projects/uart/arm/at91/at91_spireg.h#2 integrate
.. //depot/projects/uart/arm/at91/at91_ssc.c#2 integrate
.. //depot/projects/uart/arm/at91/at91_st.c#4 integrate
.. //depot/projects/uart/arm/at91/at91_twi.c#3 integrate
.. //depot/projects/uart/arm/at91/files.at91#4 integrate
.. //depot/projects/uart/arm/at91/if_ate.c#6 integrate
.. //depot/projects/uart/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/uart/arm/at91/std.at91#2 integrate
.. //depot/projects/uart/arm/at91/std.kb920x#3 integrate
.. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#7 integrate
.. //depot/projects/uart/arm/conf/KB920X#5 integrate
.. //depot/projects/uart/arm/include/db_machdep.h#5 integrate
.. //depot/projects/uart/arm/include/gdb_machdep.h#1 branch
.. //depot/projects/uart/arm/xscale/i80321/i80321.c#6 integrate
.. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#8 integrate
.. //depot/projects/uart/arm/xscale/i80321/iq80321.c#10 integrate
.. //depot/projects/uart/boot/forth/loader.conf#11 integrate
.. //depot/projects/uart/cam/scsi/scsi_cd.c#13 integrate
.. //depot/projects/uart/cam/scsi/scsi_da.c#19 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#16 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#16 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#16 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#16 integrate
.. //depot/projects/uart/compat/freebsd32/syscalls.master#15 integrate
.. //depot/projects/uart/compat/linux/linux_file.c#8 integrate
.. //depot/projects/uart/compat/linux/linux_ipc.c#8 integrate
.. //depot/projects/uart/compat/linux/linux_misc.c#17 integrate
.. //depot/projects/uart/compat/linux/linux_socket.c#13 integrate
.. //depot/projects/uart/compat/svr4/svr4_ipc.c#7 integrate
.. //depot/projects/uart/compat/svr4/svr4_misc.c#11 integrate
.. //depot/projects/uart/compat/svr4/svr4_proto.h#6 integrate
.. //depot/projects/uart/compat/svr4/svr4_socket.c#5 integrate
.. //depot/projects/uart/compat/svr4/svr4_socket.h#4 integrate
.. //depot/projects/uart/compat/svr4/svr4_stream.c#9 integrate
.. //depot/projects/uart/compat/svr4/svr4_stropts.h#3 integrate
.. //depot/projects/uart/compat/svr4/svr4_syscall.h#6 integrate
.. //depot/projects/uart/compat/svr4/svr4_syscallnames.c#6 integrate
.. //depot/projects/uart/compat/svr4/svr4_sysent.c#6 integrate
.. //depot/projects/uart/compat/svr4/svr4_sysvec.c#7 integrate
.. //depot/projects/uart/compat/svr4/svr4_util.h#6 integrate
.. //depot/projects/uart/compat/svr4/syscalls.master#6 integrate
.. //depot/projects/uart/conf/Makefile.arm#12 integrate
.. //depot/projects/uart/conf/NOTES#42 integrate
.. //depot/projects/uart/conf/files#74 integrate
.. //depot/projects/uart/conf/files.arm#7 integrate
.. //depot/projects/uart/conf/files.i386#30 integrate
.. //depot/projects/uart/conf/files.ia64#19 integrate
.. //depot/projects/uart/conf/files.powerpc#11 integrate
.. //depot/projects/uart/conf/kern.pre.mk#13 integrate
.. //depot/projects/uart/conf/options#40 integrate
.. //depot/projects/uart/conf/options.arm#9 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src.diff#2 delete
.. //depot/projects/uart/contrib/ia64/libuwx/src/Makefile#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx.h#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_bstream.c#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_bstream.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_context.c#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_context.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_env.c#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_env.h#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self.c#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self_context.s#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.c#4 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_str.c#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_str.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_swap.c#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_swap.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.c#5 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.h#5 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_ttrace.c#4 delete
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_ttrace.h#3 delete
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.c#5 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.h#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate
.. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate
.. //depot/projects/uart/contrib/pf/net/if_pflog.c#7 integrate
.. //depot/projects/uart/contrib/pf/net/if_pfsync.c#8 integrate
.. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#9 integrate
.. //depot/projects/uart/crypto/via/padlock.c#5 integrate
.. //depot/projects/uart/crypto/via/padlock.h#1 branch
.. //depot/projects/uart/crypto/via/padlock_cipher.c#1 branch
.. //depot/projects/uart/crypto/via/padlock_hash.c#1 branch
.. //depot/projects/uart/ddb/db_command.c#11 integrate
.. //depot/projects/uart/ddb/db_output.c#7 integrate
.. //depot/projects/uart/ddb/db_output.h#3 integrate
.. //depot/projects/uart/ddb/db_ps.c#11 integrate
.. //depot/projects/uart/ddb/db_thread.c#6 integrate
.. //depot/projects/uart/ddb/ddb.h#10 integrate
.. //depot/projects/uart/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/uart/dev/acpica/acpi_perf.c#4 integrate
.. //depot/projects/uart/dev/acpica/acpi_thermal.c#10 integrate
.. //depot/projects/uart/dev/amr/amr.c#16 integrate
.. //depot/projects/uart/dev/asr/MAINTAINER#2 delete
.. //depot/projects/uart/dev/ata/ata-chipset.c#22 integrate
.. //depot/projects/uart/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/uart/dev/ata/ata-queue.c#19 integrate
.. //depot/projects/uart/dev/ath/ath_rate/sample/sample.h#3 integrate
.. //depot/projects/uart/dev/ath/if_ath.c#33 integrate
.. //depot/projects/uart/dev/bce/if_bce.c#3 integrate
.. //depot/projects/uart/dev/em/if_em.c#23 integrate
.. //depot/projects/uart/dev/em/if_em.h#19 integrate
.. //depot/projects/uart/dev/fdc/fdc.c#12 integrate
.. //depot/projects/uart/dev/iicbus/iic.c#6 integrate
.. //depot/projects/uart/dev/iicbus/iic.h#2 integrate
.. //depot/projects/uart/dev/iicbus/iicbus.c#5 integrate
.. //depot/projects/uart/dev/iicbus/iicbus.h#3 integrate
.. //depot/projects/uart/dev/iicbus/iicbus_if.m#3 integrate
.. //depot/projects/uart/dev/iicbus/iiconf.c#3 integrate
.. //depot/projects/uart/dev/iicbus/iiconf.h#2 integrate
.. //depot/projects/uart/dev/isp/isp.c#14 integrate
.. //depot/projects/uart/dev/isp/isp_freebsd.c#17 integrate
.. //depot/projects/uart/dev/isp/isp_freebsd.h#13 integrate
.. //depot/projects/uart/dev/isp/isp_library.c#4 integrate
.. //depot/projects/uart/dev/isp/isp_pci.c#15 integrate
.. //depot/projects/uart/dev/isp/isp_sbus.c#11 integrate
.. //depot/projects/uart/dev/isp/isp_target.c#9 integrate
.. //depot/projects/uart/dev/ispfw/asm_1040.h#3 integrate
.. //depot/projects/uart/dev/ispfw/asm_1080.h#3 integrate
.. //depot/projects/uart/dev/ispfw/asm_12160.h#4 integrate
.. //depot/projects/uart/dev/ispfw/ispfw.c#7 integrate
.. //depot/projects/uart/dev/iwi/if_iwi.c#11 integrate
.. //depot/projects/uart/dev/kbdmux/kbdmux.c#4 integrate
.. //depot/projects/uart/dev/lmc/if_lmc.c#7 integrate
.. //depot/projects/uart/dev/lmc/if_lmc.h#3 integrate
.. //depot/projects/uart/dev/mii/gentbi.c#1 branch
.. //depot/projects/uart/dev/mii/ip1000phy.c#1 branch
.. //depot/projects/uart/dev/mii/ip1000phyreg.h#1 branch
.. //depot/projects/uart/dev/mii/miidevs#9 integrate
.. //depot/projects/uart/dev/mpt/mpt.c#19 integrate
.. //depot/projects/uart/dev/mpt/mpt.h#17 integrate
.. //depot/projects/uart/dev/mpt/mpt_cam.c#18 integrate
.. //depot/projects/uart/dev/mpt/mpt_debug.c#13 integrate
.. //depot/projects/uart/dev/mpt/mpt_pci.c#22 integrate
.. //depot/projects/uart/dev/mpt/mpt_raid.c#6 integrate
.. //depot/projects/uart/dev/mpt/mpt_raid.h#3 integrate
.. //depot/projects/uart/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/uart/dev/ncv/ncr53c500_pccard.c#9 integrate
.. //depot/projects/uart/dev/pccard/pccarddevs#19 integrate
.. //depot/projects/uart/dev/pci/pci.c#24 integrate
.. //depot/projects/uart/dev/ral/rt2560.c#5 integrate
.. //depot/projects/uart/dev/random/probe.c#4 integrate
.. //depot/projects/uart/dev/scc/scc_core.c#24 integrate
.. //depot/projects/uart/dev/scc/scc_dev_z8530.c#13 integrate
.. //depot/projects/uart/dev/sio/sio.c#18 integrate
.. //depot/projects/uart/dev/sk/if_sk.c#10 integrate
.. //depot/projects/uart/dev/sk/if_skreg.h#6 integrate
.. //depot/projects/uart/dev/sound/driver.c#7 integrate
.. //depot/projects/uart/dev/sound/midi/sequencer.c#5 integrate
.. //depot/projects/uart/dev/sound/pci/cmi.c#12 integrate
.. //depot/projects/uart/dev/sound/pci/emu10k1.c#11 integrate
.. //depot/projects/uart/dev/sound/pci/emu10kx-midi.c#1 branch
.. //depot/projects/uart/dev/sound/pci/emu10kx-pcm.c#1 branch
.. //depot/projects/uart/dev/sound/pci/emu10kx.c#1 branch
.. //depot/projects/uart/dev/sound/pci/emu10kx.h#1 branch
.. //depot/projects/uart/dev/sound/pci/envy24.c#2 integrate
.. //depot/projects/uart/dev/sound/pcm/buffer.c#6 integrate
.. //depot/projects/uart/dev/sound/pcm/buffer.h#5 integrate
.. //depot/projects/uart/dev/sound/pcm/mixer.h#5 integrate
.. //depot/projects/uart/dev/sound/pcm/sound.c#12 integrate
.. //depot/projects/uart/dev/sound/pcm/sound.h#11 integrate
.. //depot/projects/uart/dev/spibus/spi.h#1 branch
.. //depot/projects/uart/dev/spibus/spibus.c#1 branch
.. //depot/projects/uart/dev/spibus/spibus_if.m#1 branch
.. //depot/projects/uart/dev/spibus/spibusvar.h#1 branch
.. //depot/projects/uart/dev/stg/tmc18c30_subr.c#6 integrate
.. //depot/projects/uart/dev/stge/if_stge.c#1 branch
.. //depot/projects/uart/dev/stge/if_stgereg.h#1 branch
.. //depot/projects/uart/dev/streams/streams.c#7 integrate
.. //depot/projects/uart/dev/uart/uart_cpu_powerpc.c#2 integrate
.. //depot/projects/uart/dev/uart/uart_dev_z8530.c#32 integrate
.. //depot/projects/uart/dev/uart/uart_tty.c#30 integrate
.. //depot/projects/uart/dev/usb/if_ural.c#10 integrate
.. //depot/projects/uart/dev/usb/uplcom.c#16 integrate
.. //depot/projects/uart/dev/usb/usbdevs#25 integrate
.. //depot/projects/uart/doc/Doxyfile#2 delete
.. //depot/projects/uart/doc/Makefile#2 delete
.. //depot/projects/uart/doc/subsys/Dependencies#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-cam#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-crypto#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-dev_pci#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-dev_sound#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-dev_usb#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-geom#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-i4b#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-kern#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-libkern#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-linux#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-net80211#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-netgraph#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-netinet#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-netinet6#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-netipsec#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-opencrypto#2 delete
.. //depot/projects/uart/doc/subsys/Doxyfile-vm#2 delete
.. //depot/projects/uart/doc/subsys/Makefile#2 delete
.. //depot/projects/uart/doc/subsys/README#2 delete
.. //depot/projects/uart/doc/subsys/common-Doxyfile#2 delete
.. //depot/projects/uart/doc/subsys/notreviewed.dox#2 delete
.. //depot/projects/uart/fs/devfs/devfs_devs.c#9 integrate
.. //depot/projects/uart/fs/devfs/devfs_rule.c#7 integrate
.. //depot/projects/uart/fs/devfs/devfs_vfsops.c#11 integrate
.. //depot/projects/uart/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/uart/fs/portalfs/portal_vnops.c#6 integrate
.. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#11 integrate
.. //depot/projects/uart/fs/udf/ecma167-udf.h#4 integrate
.. //depot/projects/uart/fs/udf/udf_vfsops.c#15 integrate
.. //depot/projects/uart/geom/eli/g_eli.c#9 integrate
.. //depot/projects/uart/geom/eli/g_eli_integrity.c#2 integrate
.. //depot/projects/uart/geom/geom.h#12 integrate
.. //depot/projects/uart/geom/mirror/g_mirror.c#17 integrate
.. //depot/projects/uart/geom/mirror/g_mirror_ctl.c#9 integrate
.. //depot/projects/uart/geom/raid3/g_raid3.c#20 integrate
.. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#9 integrate
.. //depot/projects/uart/gnu/dev/sound/pci/emu10k1-ac97.h#3 delete
.. //depot/projects/uart/gnu/dev/sound/pci/emu10k1-alsa.h#4 integrate
.. //depot/projects/uart/gnu/dev/sound/pci/emu10k1.h#4 delete
.. //depot/projects/uart/gnu/dev/sound/pci/p16v-alsa.h#1 branch
.. //depot/projects/uart/gnu/dev/sound/pci/p17v-alsa.h#1 branch
.. //depot/projects/uart/i386/conf/GENERIC#22 integrate
.. //depot/projects/uart/i386/conf/PAE#12 integrate
.. //depot/projects/uart/i386/i386/db_trace.c#11 integrate
.. //depot/projects/uart/i386/i386/identcpu.c#20 integrate
.. //depot/projects/uart/i386/i386/initcpu.c#9 integrate
.. //depot/projects/uart/i386/i386/intr_machdep.c#7 integrate
.. //depot/projects/uart/i386/i386/local_apic.c#11 integrate
.. //depot/projects/uart/i386/i386/machdep.c#24 integrate
.. //depot/projects/uart/i386/i386/pmap.c#42 integrate
.. //depot/projects/uart/i386/i386/trap.c#14 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_ipc.c#4 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_ipc.h#4 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_isc.c#3 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_isc_sysent.c#5 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#10 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_other.c#4 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_proto.h#7 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_syscall.h#7 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_sysent.c#7 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_util.h#5 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.c#5 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.h#6 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate
.. //depot/projects/uart/i386/ibcs2/imgact_coff.c#7 integrate
.. //depot/projects/uart/i386/ibcs2/syscalls.isc#5 integrate
.. //depot/projects/uart/i386/ibcs2/syscalls.master#7 integrate
.. //depot/projects/uart/i386/ibcs2/syscalls.xenix#6 integrate
.. //depot/projects/uart/i386/include/i4b_ioctl.h#3 integrate
.. //depot/projects/uart/i386/include/md_var.h#10 integrate
.. //depot/projects/uart/i386/include/specialreg.h#7 integrate
.. //depot/projects/uart/i386/linux/linux_proto.h#11 integrate
.. //depot/projects/uart/i386/linux/linux_syscall.h#11 integrate
.. //depot/projects/uart/i386/linux/linux_sysent.c#11 integrate
.. //depot/projects/uart/i386/linux/syscalls.master#11 integrate
.. //depot/projects/uart/i4b/layer4/i4b_l4mgmt.c#3 integrate
.. //depot/projects/uart/ia64/conf/DEFAULTS#5 integrate
.. //depot/projects/uart/ia64/conf/GENERIC#14 integrate
.. //depot/projects/uart/ia64/ia32/ia32_trap.c#6 integrate
.. //depot/projects/uart/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/uart/ia64/ia64/trap.c#17 integrate
.. //depot/projects/uart/isa/isahint.c#5 integrate
.. //depot/projects/uart/kern/bus_if.m#5 integrate
.. //depot/projects/uart/kern/init_sysent.c#18 integrate
.. //depot/projects/uart/kern/kern_descrip.c#24 integrate
.. //depot/projects/uart/kern/kern_environment.c#10 integrate
.. //depot/projects/uart/kern/kern_intr.c#12 integrate
.. //depot/projects/uart/kern/kern_ktr.c#11 integrate
.. //depot/projects/uart/kern/kern_linker.c#11 integrate
.. //depot/projects/uart/kern/kern_lock.c#12 integrate
.. //depot/projects/uart/kern/kern_mac.c#13 integrate
.. //depot/projects/uart/kern/kern_malloc.c#14 integrate
.. //depot/projects/uart/kern/kern_mutex.c#15 integrate
.. //depot/projects/uart/kern/kern_rwlock.c#6 integrate
.. //depot/projects/uart/kern/kern_sx.c#7 integrate
.. //depot/projects/uart/kern/kern_thr.c#13 integrate
.. //depot/projects/uart/kern/kern_uuid.c#5 integrate
.. //depot/projects/uart/kern/link_elf.c#9 integrate
.. //depot/projects/uart/kern/makesyscalls.sh#4 integrate
.. //depot/projects/uart/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/uart/kern/subr_autoconf.c#5 integrate
.. //depot/projects/uart/kern/subr_bus.c#16 integrate
.. //depot/projects/uart/kern/subr_hints.c#6 integrate
.. //depot/projects/uart/kern/subr_prf.c#10 integrate
.. //depot/projects/uart/kern/subr_turnstile.c#10 integrate
.. //depot/projects/uart/kern/sys_generic.c#13 integrate
.. //depot/projects/uart/kern/sys_socket.c#8 integrate
.. //depot/projects/uart/kern/syscalls.c#18 integrate
.. //depot/projects/uart/kern/syscalls.master#19 integrate
.. //depot/projects/uart/kern/sysv_sem.c#12 integrate
.. //depot/projects/uart/kern/uipc_domain.c#10 integrate
.. //depot/projects/uart/kern/uipc_sockbuf.c#1 branch
.. //depot/projects/uart/kern/uipc_socket.c#21 integrate
.. //depot/projects/uart/kern/uipc_socket2.c#16 integrate
.. //depot/projects/uart/kern/uipc_syscalls.c#22 integrate
.. //depot/projects/uart/kern/uipc_usrreq.c#16 integrate
.. //depot/projects/uart/kern/vfs_bio.c#24 integrate
.. //depot/projects/uart/kern/vfs_subr.c#34 integrate
.. //depot/projects/uart/kern/vfs_syscalls.c#27 integrate
.. //depot/projects/uart/modules/Makefile#40 integrate
.. //depot/projects/uart/modules/agp/Makefile#6 integrate
.. //depot/projects/uart/modules/asr/Makefile#4 integrate
.. //depot/projects/uart/modules/bridgestp/Makefile#1 branch
.. //depot/projects/uart/modules/hwpmc/Makefile#3 integrate
.. //depot/projects/uart/modules/if_bridge/Makefile#5 integrate
.. //depot/projects/uart/modules/ispfw/Makefile#2 integrate
.. //depot/projects/uart/modules/ispfw/isp_1000/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_1040/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_1040_it/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_1080/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_1080_it/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_12160/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_12160_it/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_2100/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_2200/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_2300/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/isp_2322/Makefile#1 branch
.. //depot/projects/uart/modules/ispfw/ispfw/Makefile#1 branch
.. //depot/projects/uart/modules/mii/Makefile#5 integrate
.. //depot/projects/uart/modules/osf1/Makefile#5 delete
.. //depot/projects/uart/modules/padlock/Makefile#2 integrate
.. //depot/projects/uart/modules/sound/driver/Makefile#5 integrate
.. //depot/projects/uart/modules/sound/driver/emu10kx/Makefile#1 branch
.. //depot/projects/uart/modules/stge/Makefile#1 branch
.. //depot/projects/uart/net/bpf.c#17 integrate
.. //depot/projects/uart/net/bridgestp.c#6 integrate
.. //depot/projects/uart/net/bridgestp.h#1 branch
.. //depot/projects/uart/net/if.c#22 integrate
.. //depot/projects/uart/net/if_bridge.c#12 integrate
.. //depot/projects/uart/net/if_bridgevar.h#6 integrate
.. //depot/projects/uart/net/if_clone.c#6 integrate
.. //depot/projects/uart/net/if_clone.h#4 integrate
.. //depot/projects/uart/net/if_disc.c#9 integrate
.. //depot/projects/uart/net/if_enc.c#2 integrate
.. //depot/projects/uart/net/if_ethersubr.c#16 integrate
.. //depot/projects/uart/net/if_faith.c#9 integrate
.. //depot/projects/uart/net/if_gif.c#10 integrate
.. //depot/projects/uart/net/if_gre.c#10 integrate
.. //depot/projects/uart/net/if_loop.c#10 integrate
.. //depot/projects/uart/net/if_ppp.c#9 integrate
.. //depot/projects/uart/net/if_spppsubr.c#7 integrate
.. //depot/projects/uart/net/if_stf.c#11 integrate
.. //depot/projects/uart/net/if_tap.c#11 integrate
.. //depot/projects/uart/net/if_vlan.c#17 integrate
.. //depot/projects/uart/net/raw_usrreq.c#9 integrate
.. //depot/projects/uart/net/rtsock.c#13 integrate
.. //depot/projects/uart/net80211/ieee80211.c#14 integrate
.. //depot/projects/uart/net80211/ieee80211.h#6 integrate
.. //depot/projects/uart/net80211/ieee80211_freebsd.h#4 integrate
.. //depot/projects/uart/net80211/ieee80211_input.c#18 integrate
.. //depot/projects/uart/net80211/ieee80211_ioctl.c#17 integrate
.. //depot/projects/uart/net80211/ieee80211_ioctl.h#9 integrate
.. //depot/projects/uart/net80211/ieee80211_output.c#18 integrate
.. //depot/projects/uart/net80211/ieee80211_proto.c#13 integrate
.. //depot/projects/uart/net80211/ieee80211_proto.h#10 integrate
.. //depot/projects/uart/net80211/ieee80211_var.h#15 integrate
.. //depot/projects/uart/netatalk/ddp_usrreq.c#8 integrate
.. //depot/projects/uart/netatm/atm_aal5.c#7 integrate
.. //depot/projects/uart/netatm/atm_usrreq.c#8 integrate
.. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#5 integrate
.. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_l2cap.h#6 integrate
.. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#7 integrate
.. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket.c#8 integrate
.. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate
.. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate
.. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#7 integrate
.. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate
.. //depot/projects/uart/netgraph/ng_ether.c#8 integrate
.. //depot/projects/uart/netgraph/ng_ksocket.c#10 integrate
.. //depot/projects/uart/netgraph/ng_socket.c#13 integrate
.. //depot/projects/uart/netinet/in_pcb.c#20 integrate
.. //depot/projects/uart/netinet/in_pcb.h#11 integrate
.. //depot/projects/uart/netinet/ip_carp.c#7 integrate
.. //depot/projects/uart/netinet/ip_divert.c#14 integrate
.. //depot/projects/uart/netinet/raw_ip.c#17 integrate
.. //depot/projects/uart/netinet/tcp_subr.c#22 integrate
.. //depot/projects/uart/netinet/tcp_usrreq.c#16 integrate
.. //depot/projects/uart/netinet/udp_usrreq.c#20 integrate
.. //depot/projects/uart/netinet6/README#3 delete
.. //depot/projects/uart/netinet6/icmp6.c#11 integrate
.. //depot/projects/uart/netinet6/in6_pcb.c#15 integrate
.. //depot/projects/uart/netinet6/raw_ip6.c#13 integrate
.. //depot/projects/uart/netinet6/udp6_usrreq.c#14 integrate
.. //depot/projects/uart/netipsec/keysock.c#10 integrate
.. //depot/projects/uart/netipx/ipx_usrreq.c#9 integrate
.. //depot/projects/uart/netipx/spx_usrreq.c#13 integrate
.. //depot/projects/uart/netkey/keysock.c#10 integrate
.. //depot/projects/uart/netnatm/natm.c#12 integrate
.. //depot/projects/uart/netncp/ncp_sock.c#3 integrate
.. //depot/projects/uart/netsmb/smb_conn.c#7 integrate
.. //depot/projects/uart/netsmb/smb_trantcp.c#4 integrate
.. //depot/projects/uart/nfs4client/nfs4_vnops.c#7 integrate
.. //depot/projects/uart/nfsclient/nfs_socket.c#14 integrate
.. //depot/projects/uart/nfsclient/nfs_vnops.c#17 integrate
.. //depot/projects/uart/nfsserver/nfs_srvsock.c#10 integrate
.. //depot/projects/uart/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/uart/pc98/conf/GENERIC#17 integrate
.. //depot/projects/uart/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/uart/posix4/ksched.c#7 integrate
.. //depot/projects/uart/posix4/p1003_1b.c#6 integrate
.. //depot/projects/uart/posix4/posix4.h#2 integrate
.. //depot/projects/uart/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/uart/powerpc/conf/NOTES#2 integrate
.. //depot/projects/uart/powerpc/include/md_var.h#3 integrate
.. //depot/projects/uart/powerpc/include/ofw_machdep.h#3 integrate
.. //depot/projects/uart/powerpc/include/pcb.h#3 integrate
.. //depot/projects/uart/powerpc/powerpc/clock.c#9 integrate
.. //depot/projects/uart/powerpc/powerpc/db_trace.c#8 integrate
.. //depot/projects/uart/powerpc/powerpc/mem.c#2 integrate
.. //depot/projects/uart/powerpc/powerpc/mmu_oea.c#5 integrate
.. //depot/projects/uart/powerpc/powerpc/ofw_machdep.c#5 integrate
.. //depot/projects/uart/powerpc/powerpc/trap.c#9 integrate
.. //depot/projects/uart/powerpc/psim/sio_iobus.c#4 delete
.. //depot/projects/uart/powerpc/psim/uart_iobus.c#1 branch
.. //depot/projects/uart/security/mac/mac_vfs.c#7 integrate
.. //depot/projects/uart/security/mac_biba/mac_biba.c#10 integrate
.. //depot/projects/uart/sparc64/conf/GENERIC#23 integrate
.. //depot/projects/uart/sparc64/include/pmap.h#8 integrate
.. //depot/projects/uart/sparc64/sparc64/db_trace.c#8 integrate
.. //depot/projects/uart/sparc64/sparc64/trap.c#14 integrate
.. //depot/projects/uart/sys/_label.h#3 integrate
.. //depot/projects/uart/sys/bufobj.h#8 integrate
.. //depot/projects/uart/sys/bus.h#12 integrate
.. //depot/projects/uart/sys/extattr.h#2 integrate
.. //depot/projects/uart/sys/libkern.h#7 integrate
.. //depot/projects/uart/sys/mbuf.h#13 integrate
.. //depot/projects/uart/sys/mutex.h#13 integrate
.. //depot/projects/uart/sys/param.h#27 integrate
.. //depot/projects/uart/sys/protosw.h#11 integrate
.. //depot/projects/uart/sys/socket.h#7 integrate
.. //depot/projects/uart/sys/socketvar.h#14 integrate
.. //depot/projects/uart/sys/sockio.h#6 integrate
.. //depot/projects/uart/sys/syscall.h#17 integrate
.. //depot/projects/uart/sys/syscall.mk#17 integrate
.. //depot/projects/uart/sys/syscallsubr.h#13 integrate
.. //depot/projects/uart/sys/sysctl.h#12 integrate
.. //depot/projects/uart/sys/sysent.h#6 integrate
.. //depot/projects/uart/sys/sysproto.h#18 integrate
.. //depot/projects/uart/sys/systm.h#16 integrate
.. //depot/projects/uart/sys/thr.h#6 integrate
.. //depot/projects/uart/sys/unpcb.h#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_alloc.c#9 integrate
.. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#26 integrate
.. //depot/projects/uart/ufs/ufs/ufs_lookup.c#8 integrate
.. //depot/projects/uart/vm/pmap.h#15 integrate
.. //depot/projects/uart/vm/uma_core.c#23 integrate
.. //depot/projects/uart/vm/vm.h#5 integrate
.. //depot/projects/uart/vm/vm_fault.c#17 integrate
.. //depot/projects/uart/vm/vm_map.c#23 integrate
.. //depot/projects/uart/vm/vm_meter.c#8 integrate
.. //depot/projects/uart/vm/vm_object.c#22 integrate
.. //depot/projects/uart/vm/vm_object.h#8 integrate
.. //depot/projects/uart/vm/vm_page.c#23 integrate
Differences ...
==== //depot/projects/uart/amd64/amd64/db_trace.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -390,16 +390,14 @@
long *argp;
db_expr_t offset;
c_db_sym_t sym;
- int narg, quit;
+ int narg;
boolean_t first;
if (count == -1)
count = 1024;
first = TRUE;
- quit = 0;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- while (count-- && !quit) {
+ while (count-- && !db_pager_quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &offset);
db_symbol_values(sym, &name, NULL);
==== //depot/projects/uart/amd64/amd64/identcpu.c#10 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $");
#include "opt_cpu.h"
@@ -306,8 +306,8 @@
"\020"
"\001LAHF" /* LAHF/SAHF in long mode */
"\002CMP" /* CMP legacy */
- "\003<b2>"
- "\004<b3>"
+ "\003SVM" /* Secure Virtual Mode */
+ "\004ExtAPIC" /* Extended APIC register */
"\005CR8" /* CR8 in legacy mode */
"\006<b5>"
"\007<b6>"
==== //depot/projects/uart/amd64/amd64/intr_machdep.c#9 (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.19 2006/02/28 22:24:54 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $
*/
/*
@@ -338,16 +338,14 @@
DB_SHOW_COMMAND(irqs, db_show_irqs)
{
struct intsrc **isrc;
- int i, quit, verbose;
+ int i, verbose;
- quit = 0;
if (strcmp(modif, "v") == 0)
verbose = 1;
else
verbose = 0;
isrc = interrupt_sources;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++)
+ for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++)
if (*isrc != NULL)
db_dump_intr_event((*isrc)->is_event, verbose);
}
==== //depot/projects/uart/amd64/amd64/local_apic.c#10 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $");
#include "opt_hwpmc_hooks.h"
@@ -755,18 +755,16 @@
DB_SHOW_COMMAND(apic, db_show_apic)
{
struct intsrc *isrc;
- int quit, i, verbose;
+ int i, verbose;
u_int irq;
- quit = 0;
if (strcmp(modif, "vv") == 0)
verbose = 2;
else if (strcmp(modif, "v") == 0)
verbose = 1;
else
verbose = 0;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) {
+ for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) {
irq = ioint_irqs[i];
if (irq != 0 && irq != IRQ_SYSCALL) {
db_printf("vec 0x%2x -> ", i + APIC_IO_INTS);
==== //depot/projects/uart/amd64/amd64/machdep.c#21 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -947,17 +947,17 @@
if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable))
Maxmem = atop(physmem_tunable);
+ /*
+ * Don't allow MAXMEM or hw.physmem to extend the amount of memory
+ * in the system.
+ */
+ if (Maxmem > atop(physmap[physmap_idx + 1]))
+ Maxmem = atop(physmap[physmap_idx + 1]);
+
if (atop(physmap[physmap_idx + 1]) != Maxmem &&
(boothowto & RB_VERBOSE))
printf("Physical memory use set to %ldK\n", Maxmem * 4);
- /*
- * If Maxmem has been increased beyond what the system has detected,
- * extend the last memory segment to the new limit.
- */
- if (atop(physmap[physmap_idx + 1]) < Maxmem)
- physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem);
-
/* call pmap initialization to make new kernel address space */
pmap_bootstrap(&first);
==== //depot/projects/uart/amd64/amd64/pmap.c#41 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $");
/*
* Manages physical address maps.
@@ -207,7 +207,6 @@
static void free_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try);
-static void pmap_clear_write(vm_page_t m);
static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
vm_page_t m, vm_prot_t prot, vm_page_t mpte);
@@ -1627,6 +1626,7 @@
int idx, field, bit;
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
PV_STAT(pv_entry_frees++);
PV_STAT(pv_entry_spare++);
pv_entry_count--;
@@ -2015,8 +2015,8 @@
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count--;
pmap_unuse_pt(pmap, pv->pv_va, ptepde);
+ free_pv_entry(pmap, pv);
PMAP_UNLOCK(pmap);
- free_pv_entry(pmap, pv);
}
vm_page_flag_clear(m, PG_WRITEABLE);
}
@@ -2971,7 +2971,7 @@
/*
* Clear the write and modified bits in each of the given page's mappings.
*/
-static __inline void
+void
pmap_clear_write(vm_page_t m)
{
pv_entry_t pv;
==== //depot/projects/uart/amd64/amd64/trap.c#13 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -145,9 +145,7 @@
SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
&panic_on_nmi, 0, "Panic on NMI");
-#ifdef WITNESS
extern char *syscallnames[];
-#endif
/*
* Exception, fault, and trap interface to the FreeBSD kernel.
@@ -780,7 +778,7 @@
else
callp = &p->p_sysent->sv_table[code];
- narg = callp->sy_narg & SYF_ARGMASK;
+ narg = callp->sy_narg;
/*
* copyin and the ktrsyscall()/ktrsysret() code is MP-aware
@@ -814,17 +812,9 @@
PTRACESTOP_SC(p, td, S_PT_SCE);
- if ((callp->sy_narg & SYF_MPSAFE) == 0) {
- mtx_lock(&Giant);
- AUDIT_SYSCALL_ENTER(code, td);
- error = (*callp->sy_call)(td, argp);
- AUDIT_SYSCALL_EXIT(error, td);
- mtx_unlock(&Giant);
- } else {
- AUDIT_SYSCALL_ENTER(code, td);
- error = (*callp->sy_call)(td, argp);
- AUDIT_SYSCALL_EXIT(error, td);
- }
+ AUDIT_SYSCALL_ENTER(code, td);
+ error = (*callp->sy_call)(td, argp);
+ AUDIT_SYSCALL_EXIT(error, td);
}
switch (error) {
@@ -874,6 +864,19 @@
}
/*
+ * Check for misbehavior.
+ */
+ WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
+ KASSERT(td->td_critnest == 0,
+ ("System call %s returning in a critical section",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"));
+ KASSERT(td->td_locks == 0,
+ ("System call %s returning with %d locks held",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???",
+ td->td_locks));
+
+ /*
* Handle reschedule and other end-of-syscall issues
*/
userret(td, &frame);
@@ -894,9 +897,4 @@
STOPEVENT(p, S_SCX, code);
PTRACESTOP_SC(p, td, S_PT_SCX);
-
- WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
- (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
- mtx_assert(&sched_lock, MA_NOTOWNED);
- mtx_assert(&Giant, MA_NOTOWNED);
}
==== //depot/projects/uart/amd64/amd64/vm_machdep.c#12 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -328,7 +328,6 @@
td->td_frame->tf_rsp =
((register_t)stack->ss_sp + stack->ss_size) & ~0x0f;
td->td_frame->tf_rsp -= 8;
- td->td_frame->tf_rbp = 0;
td->td_frame->tf_rip = (register_t)entry;
/*
==== //depot/projects/uart/amd64/conf/GENERIC#23 (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.463 2006/07/05 02:32:55 davidxu Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $
cpu HAMMER
ident GENERIC
@@ -251,6 +251,7 @@
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
+device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
==== //depot/projects/uart/amd64/ia32/ia32_syscall.c#9 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $");
/*
* 386 Trap and System call handling
@@ -56,6 +56,7 @@
#include <sys/ktr.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/ptrace.h>
#include <sys/resourcevar.h>
#include <sys/signalvar.h>
#include <sys/syscall.h>
@@ -153,7 +154,7 @@
else
callp = &p->p_sysent->sv_table[code];
- narg = callp->sy_narg & SYF_ARGMASK;
+ narg = callp->sy_narg;
/*
* copyin and the ktrsyscall()/ktrsysret() code is MP-aware
@@ -171,12 +172,8 @@
if (KTRPOINT(td, KTR_SYSCALL))
ktrsyscall(code, narg, args64);
#endif
- /*
- * Try to run the syscall without Giant if the syscall
- * is MP safe.
- */
- if ((callp->sy_narg & SYF_MPSAFE) == 0)
- mtx_lock(&Giant);
+ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
+ td->td_proc->p_pid, td->td_proc->p_comm, code);
if (error == 0) {
td->td_retval[0] = 0;
@@ -184,6 +181,8 @@
STOPEVENT(p, S_SCE, narg);
+ PTRACESTOP_SC(p, td, S_PT_SCE);
+
AUDIT_SYSCALL_ENTER(code, td);
error = (*callp->sy_call)(td, args64);
AUDIT_SYSCALL_EXIT(error, td);
@@ -220,12 +219,6 @@
}
/*
- * Release Giant if we previously set it.
- */
- if ((callp->sy_narg & SYF_MPSAFE) == 0)
- mtx_unlock(&Giant);
-
- /*
* Traced syscall.
*/
if (orig_tf_rflags & PSL_T) {
@@ -238,10 +231,25 @@
}
/*
+ * Check for misbehavior.
+ */
+ WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???");
+ KASSERT(td->td_critnest == 0,
+ ("System call %s returning in a critical section",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"));
+ KASSERT(td->td_locks == 0,
+ ("System call %s returning with %d locks held",
+ (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???",
+ td->td_locks));
+
+ /*
* Handle reschedule and other end-of-syscall issues
*/
userret(td, &frame);
+ CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
+ td->td_proc->p_pid, td->td_proc->p_comm, code);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSRET))
ktrsysret(code, error, td->td_retval[0]);
@@ -253,11 +261,8 @@
* is not the case, this code will need to be revisited.
*/
STOPEVENT(p, S_SCX, code);
-
- WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
- (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???");
- mtx_assert(&sched_lock, MA_NOTOWNED);
- mtx_assert(&Giant, MA_NOTOWNED);
+
+ PTRACESTOP_SC(p, td, S_PT_SCX);
}
==== //depot/projects/uart/amd64/include/specialreg.h#6 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.33 2006/05/01 22:07:00 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -109,16 +109,18 @@
#define CPUID_SS 0x08000000
#define CPUID_HTT 0x10000000
#define CPUID_TM 0x20000000
-#define CPUID_B30 0x40000000
+#define CPUID_IA64 0x40000000
#define CPUID_PBE 0x80000000
#define CPUID2_SSE3 0x00000001
#define CPUID2_MON 0x00000008
#define CPUID2_DS_CPL 0x00000010
+#define CPUID2_VMX 0x00000020
#define CPUID2_EST 0x00000080
#define CPUID2_TM2 0x00000100
#define CPUID2_CNTXID 0x00000400
#define CPUID2_CX16 0x00002000
+#define CPUID2_XTPR 0x00004000
/*
* Important bits in the AMD extended cpuid flags
@@ -135,6 +137,8 @@
#define AMDID2_LAHF 0x00000001
#define AMDID2_CMP 0x00000002
+#define AMDID2_SVM 0x00000004
+#define AMDID2_EXT_APIC 0x00000008
#define AMDID2_CR8 0x00000010
/*
@@ -188,6 +192,7 @@
#define MSR_THERM_CONTROL 0x19a
#define MSR_THERM_INTERRUPT 0x19b
#define MSR_THERM_STATUS 0x19c
+#define MSR_IA32_MISC_ENABLE 0x1a0
#define MSR_DEBUGCTLMSR 0x1d9
#define MSR_LASTBRANCHFROMIP 0x1db
#define MSR_LASTBRANCHTOIP 0x1dc
@@ -356,7 +361,7 @@
#define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */
#define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */
-/* X86-64 MSR's */
+/* AMD64 MSR's */
#define MSR_EFER 0xc0000080 /* extended features */
#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */
#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */
==== //depot/projects/uart/amd64/linux32/linux32_proto.h#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.17 2006/07/06 21:43:14 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list