Date: Sat, 5 Aug 2006 22:08:43 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103285 for review Message-ID: <200608052208.k75M8h7p055221@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103285 Change 103285 by rwatson@rwatson_zoo on 2006/08/05 22:07:53 Integrate mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.powerpc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/miidevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/random/probe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/re/if_re.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sio/sio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/doc/Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/PAE#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/isa/isahint.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/bus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_lock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_resource.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_tc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_thr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_hints.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_prf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/agp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/asr/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/mii/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/osf1/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/stge/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/if.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_disc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_faith.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gre.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_tap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_vlan.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/net_osdep.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/frag6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/mld6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/key.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keydb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netnatm/natm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/ncr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/ksched.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/posix4.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/_label.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/extattr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/kernel.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/libkern.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mbuf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/protosw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sockio.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/stat.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysent.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/systm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/thr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/types.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/unpcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/uma_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_map.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 (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/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 (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.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035<b28>" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } @@ -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/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 (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/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 (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/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 (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/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 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,8 +2971,8 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void -pmap_clear_write(vm_page_t m) +void +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. @@ -3050,14 +3033,12 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - if (pte != NULL && (*pte & PG_A) != 0) { + if ((*pte & PG_A) != 0) { atomic_clear_long(pte, PG_A); pmap_invalidate_page(pmap, pv->pv_va); rtval++; - if (rtval > 4) { - PMAP_UNLOCK(pmap); - break; - } + if (rtval > 4) + pvn = NULL; } PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 (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/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 (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/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 (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/trustedbsd/mac2/sys/amd64/conf/NOTES#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608052208.k75M8h7p055221>