PERFORCE change 94604 for review
George V. Neville-Neil
gnn at FreeBSD.org
Tue Apr 4 15:06:28 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=94604
Change 94604 by gnn at gnn_devbox_fast_ipsec on 2006/04/04 15:05:52
Integrate from HEAD
Affected files ...
.. //depot/projects/gnn_fast_ipsec/src/sys/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpu.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/syscalls.master#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/trap.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/asmacros.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/bus.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/trap.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pio.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pioreg.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmc.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcreg.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_pmcvar.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtc.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_rtcreg.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_ssc.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_sscreg.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_st.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/files.at91#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/ohci_atmelarm.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/alpha/common/Makefile.common#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/forth/beastie.4th#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/Makefile#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/smbios.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/loader/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/ia64/efi/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/ia64/ski/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/loader/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/powerpc/loader/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/boot/sparc64/loader/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_getcwd.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_mib.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_sysctl.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_uid16.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.arm#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.alpha#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.sparc64#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/aha/aha_mca.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cam.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cd.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dc.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/en/midway.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/hme/if_hme.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/md/md.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_disk.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_ioctl.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi_pci.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfireg.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfivar.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_debug.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_raid.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_reg.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_ebus.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_sbus.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_ebus.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_macio.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe_sbus.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bus.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_sab82532.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_if.m#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/isa/ad1816.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/atiixp.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ich.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/channel.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_ebus.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_scc.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_tty.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/hid.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/umass.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_cons.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_int.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_io.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/isofs/cd9660/cd9660_rrip.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_aout.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_acct.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_alq.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_event.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_tc.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/md5c.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.master#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mbuf.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket2.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cluster.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/acpi/acpi_video/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/ce/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/cp/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/dummynet/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_bridge/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_gif/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/ipfilter/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/ipfw/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/mfi/Makefile#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/pflog/Makefile#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/scc/Makefile#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/modules/uart/Makefile#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/if.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ppp.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/if_tap.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/raw_cb.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/route.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_output.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_pcb.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_aal5.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_proto.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_socket.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_usrreq.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_var.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_carp.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/key_var.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keydb.h#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_tcp.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/README#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_ip.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_pcb.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_pcb.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netipx/spx_usrreq.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netkey/keysock.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/bus.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_ioctl.h#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_worker.c#1 branch
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/clkbrd.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/clkbrdreg.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/asi.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/tick.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/aio.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/ata.h#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/buf.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/clock.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/event.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/linker.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/mbuf.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/md5.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/mount.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmckern.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmclog.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/proc.h#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/protosw.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/serial.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/socketvar.h#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/sx.h#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.mk#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysproto.h#5 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/sys/umtx.h#3 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_mmap.c#2 integrate
Differences ...
==== //depot/projects/gnn_fast_ipsec/src/sys/Makefile#3 (text+ko) ====
@@ -1,7 +1,9 @@
-# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $
+# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $
+
+.include <bsd.own.mk>
# The boot loader
-.if !defined(NO_BOOT)
+.if ${MK_BOOT} != "no"
.if ${MACHINE_ARCH} != "arm"
SUBDIR= boot
.endif
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.44 2006/03/07 22:12:09 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $");
#include "opt_clock.h"
@@ -137,7 +137,6 @@
static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc,
u_int32_t *timer);
static void set_timer_freq(u_int freq, int intr_freq);
-static uint64_t read_cycle_count(void);
void
clockattach(device_t dev)
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpu.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.44 2006/03/28 21:20:12 jhb Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*-
@@ -88,11 +88,12 @@
#define cpu_getstack(td) (alpha_pal_rdusp())
#define cpu_spinwait() /* nothing */
-#define get_cyclecount alpha_rpcc
+#define get_cyclecount() read_cycle_count()
void cpu_halt(void);
void cpu_reset(void);
void fork_trampoline(void); /* MAGIC */
+uint64_t read_cycle_count(void);
void swi_vm(void *);
#endif /* _KERNEL */
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_dummy.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.38 2004/03/29 02:19:43 bms Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.39 2006/03/21 21:08:02 netchild Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,11 +72,8 @@
DUMMY(pciconfig_read);
DUMMY(pciconfig_write);
DUMMY(pivot_root);
-DUMMY(recvmsg);
-DUMMY(sendmsg);
DUMMY(sethae);
DUMMY(sigaltstack);
DUMMY(sigpending);
-DUMMY(socketpair);
DUMMY(utimes);
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.27 2006/03/20 19:48:02 netchild Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -170,6 +170,10 @@
struct linux_gethostname_args {
register_t dummy;
};
+struct linux_sethostname_args {
+ char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
+ char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
+};
struct linux_getdtablesize_args {
register_t dummy;
};
@@ -199,10 +203,22 @@
char name_l_[PADL_(struct l_sockaddr *)]; struct l_sockaddr * name; char name_r_[PADR_(struct l_sockaddr *)];
char namelen_l_[PADL_(l_int)]; l_int namelen; char namelen_r_[PADR_(l_int)];
};
+struct linux_accept_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_accept_args *)]; struct linux_accept_args * args; char args_r_[PADR_(struct linux_accept_args *)];
+};
struct linux_getpriority_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
};
+struct linux_send_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_send_args *)]; struct linux_send_args * args; char args_r_[PADR_(struct linux_send_args *)];
+};
+struct linux_recv_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_recv_args *)]; struct linux_recv_args * args; char args_r_[PADR_(struct linux_recv_args *)];
+};
struct osf1_sigreturn_args {
char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)];
};
@@ -223,6 +239,10 @@
char who_l_[PADL_(long)]; long who; char who_r_[PADR_(long)];
char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)];
};
+struct linux_recvfrom_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_recvfrom_args *)]; struct linux_recvfrom_args * args; char args_r_[PADR_(struct linux_recvfrom_args *)];
+};
struct linux_rename_args {
char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)];
char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)];
@@ -231,6 +251,10 @@
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)];
};
+struct linux_ftruncate_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)];
+};
struct osf1_sendto_args {
char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
@@ -249,6 +273,10 @@
struct linux_rmdir_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
};
+struct linux_getpeername_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_getpeername_args *)]; struct linux_getpeername_args * args; char args_r_[PADR_(struct linux_getpeername_args *)];
+};
struct linux_getrlimit_args {
char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)];
char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)];
@@ -260,6 +288,10 @@
struct linux_quotactl_args {
register_t dummy;
};
+struct linux_getsockname_args {
+ char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
+ char args_l_[PADL_(struct linux_getsockname_args *)]; struct linux_getsockname_args * args; char args_r_[PADR_(struct linux_getsockname_args *)];
+};
struct osf1_sigaction_args {
char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
char nsa_l_[PADL_(struct osf1_sigaction *)]; struct osf1_sigaction * nsa; char nsa_r_[PADR_(struct osf1_sigaction *)];
@@ -620,28 +652,36 @@
int linux_getgroups(struct thread *, struct linux_getgroups_args *);
int osf1_setitimer(struct thread *, struct osf1_setitimer_args *);
int linux_gethostname(struct thread *, struct linux_gethostname_args *);
+int linux_sethostname(struct thread *, struct linux_sethostname_args *);
int linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *);
int linux_newfstat(struct thread *, struct linux_newfstat_args *);
int linux_fcntl(struct thread *, struct linux_fcntl_args *);
int osf1_select(struct thread *, struct osf1_select_args *);
int osf1_socket(struct thread *, struct osf1_socket_args *);
int linux_connect(struct thread *, struct linux_connect_args *);
+int linux_accept(struct thread *, struct linux_accept_args *);
int linux_getpriority(struct thread *, struct linux_getpriority_args *);
+int linux_send(struct thread *, struct linux_send_args *);
+int linux_recv(struct thread *, struct linux_recv_args *);
int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *);
int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *);
int linux_recvmsg(struct thread *, struct linux_recvmsg_args *);
int linux_sendmsg(struct thread *, struct linux_sendmsg_args *);
int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *);
int osf1_getrusage(struct thread *, struct osf1_getrusage_args *);
+int linux_recvfrom(struct thread *, struct linux_recvfrom_args *);
int linux_rename(struct thread *, struct linux_rename_args *);
int linux_truncate(struct thread *, struct linux_truncate_args *);
+int linux_ftruncate(struct thread *, struct linux_ftruncate_args *);
int osf1_sendto(struct thread *, struct osf1_sendto_args *);
int linux_socketpair(struct thread *, struct linux_socketpair_args *);
int linux_mkdir(struct thread *, struct linux_mkdir_args *);
int linux_rmdir(struct thread *, struct linux_rmdir_args *);
+int linux_getpeername(struct thread *, struct linux_getpeername_args *);
int linux_getrlimit(struct thread *, struct linux_getrlimit_args *);
int linux_setrlimit(struct thread *, struct linux_setrlimit_args *);
int linux_quotactl(struct thread *, struct linux_quotactl_args *);
+int linux_getsockname(struct thread *, struct linux_getsockname_args *);
int osf1_sigaction(struct thread *, struct osf1_sigaction_args *);
int linux_msgctl(struct thread *, struct linux_msgctl_args *);
int linux_msgget(struct thread *, struct linux_msgget_args *);
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.25 2006/03/20 19:48:02 netchild Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp
*/
#define LINUX_SYS_exit 1
@@ -57,7 +57,7 @@
#define LINUX_SYS_linux_getgroups 80
#define LINUX_SYS_osf1_setitimer 83
#define LINUX_SYS_linux_gethostname 87
-#define LINUX_SYS_osethostname 88
+#define LINUX_SYS_linux_sethostname 88
#define LINUX_SYS_linux_getdtablesize 89
#define LINUX_SYS_dup2 90
#define LINUX_SYS_linux_newfstat 91
@@ -68,10 +68,10 @@
#define LINUX_SYS_setpriority 96
#define LINUX_SYS_osf1_socket 97
#define LINUX_SYS_linux_connect 98
-#define LINUX_SYS_accept 99
+#define LINUX_SYS_linux_accept 99
#define LINUX_SYS_linux_getpriority 100
-#define LINUX_SYS_osend 101
-#define LINUX_SYS_orecv 102
+#define LINUX_SYS_linux_send 101
+#define LINUX_SYS_linux_recv 102
#define LINUX_SYS_osf1_sigreturn 103
#define LINUX_SYS_bind 104
#define LINUX_SYS_setsockopt 105
@@ -86,12 +86,12 @@
#define LINUX_SYS_writev 121
#define LINUX_SYS_fchown 123
#define LINUX_SYS_fchmod 124
-#define LINUX_SYS_recvfrom 125
+#define LINUX_SYS_linux_recvfrom 125
#define LINUX_SYS_setreuid 126
#define LINUX_SYS_setregid 127
#define LINUX_SYS_linux_rename 128
#define LINUX_SYS_linux_truncate 129
-#define LINUX_SYS_oftruncate 130
+#define LINUX_SYS_linux_ftruncate 130
#define LINUX_SYS_flock 131
#define LINUX_SYS_setgid 132
#define LINUX_SYS_osf1_sendto 133
@@ -100,12 +100,12 @@
#define LINUX_SYS_linux_mkdir 136
#define LINUX_SYS_linux_rmdir 137
#define LINUX_SYS_utimes 138
-#define LINUX_SYS_ogetpeername 141
+#define LINUX_SYS_linux_getpeername 141
#define LINUX_SYS_linux_getrlimit 144
#define LINUX_SYS_linux_setrlimit 145
#define LINUX_SYS_setsid 147
#define LINUX_SYS_linux_quotactl 148
-#define LINUX_SYS_getsockname 150
+#define LINUX_SYS_linux_getsockname 150
#define LINUX_SYS_osf1_sigaction 156
#define LINUX_SYS_setdomainname 166
#define LINUX_SYS_linux_msgctl 200
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysent.c#3 (text+ko) ====
@@ -2,12 +2,11 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.25 2006/03/20 19:48:02 netchild Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp
*/
#include <bsm/audit_kevents.h>
-#include "opt_compat.h"
#include <sys/param.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
@@ -108,7 +107,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */
- { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */
+ { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 88 = linux_sethostname */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */
{ SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */
{ SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */
@@ -119,10 +118,10 @@
{ SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */
{ SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */
{ SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */
- { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */
+ { SYF_MPSAFE | AS(linux_accept_args), (sy_call_t *)linux_accept, AUE_ACCEPT }, /* 99 = linux_accept */
{ SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */
- { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */
- { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */
+ { SYF_MPSAFE | AS(linux_send_args), (sy_call_t *)linux_send, AUE_SEND }, /* 101 = linux_send */
+ { SYF_MPSAFE | AS(linux_recv_args), (sy_call_t *)linux_recv, AUE_RECV }, /* 102 = linux_recv */
{ SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */
{ SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */
{ SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */
@@ -145,12 +144,12 @@
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */
{ AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */
{ AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */
- { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */
+ { SYF_MPSAFE | AS(linux_recvfrom_args), (sy_call_t *)linux_recvfrom, AUE_RECVFROM }, /* 125 = linux_recvfrom */
{ SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */
{ SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */
{ SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */
{ SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */
- { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */
+ { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 130 = linux_ftruncate */
{ SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */
{ SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */
{ SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */
@@ -161,7 +160,7 @@
{ SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */
- { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */
+ { SYF_MPSAFE | AS(linux_getpeername_args), (sy_call_t *)linux_getpeername, AUE_GETPEERNAME }, /* 141 = linux_getpeername */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */
{ SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */
@@ -170,7 +169,7 @@
{ SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */
- { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */
+ { SYF_MPSAFE | AS(linux_getsockname_args), (sy_call_t *)linux_getsockname, AUE_GETSOCKNAME }, /* 150 = linux_getsockname */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#3 (text+ko) ====
@@ -27,14 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $");
-
-/* XXX we use functions that might not exist. */
-#include "opt_compat.h"
-
-#ifndef COMPAT_43
-#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
-#endif
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $
+ $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -11,8 +11,7 @@
; there is no audit event for the call at this time. For the
; case where the event exists, but we don't want auditing, the
; event should be #defined to AUE_NULL in audit_kevents.h.
-; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT,
-; NODEF, NOARGS, NOPROTO
+; type one of STD, OBSOL, UNIMPL, NODEF, NOARGS, NOPROTO
; name psuedo-prototype of syscall routine
; If one of the following alts is different, then all appear:
; altname name of system call if different
@@ -22,9 +21,6 @@
; types:
; STD always included
-; COMPAT included on COMPAT #ifdef
-; CPT_NOA combines COMPAT with NOARGS
-; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h
; NOARGS same as STD except do not create structure in sys/sysproto.h
; NODEF ??
; NOPROTO same as STD except do not create structure or function in
@@ -32,7 +28,6 @@
; OBSOL obsolete, not included in system, only specifies name
; UNIMPL not implemented, placeholder only
-#include "opt_compat.h"
#include <sys/param.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
@@ -158,9 +153,7 @@
85 AUE_NULL UNIMPL
86 AUE_GETITIMER UNIMPL osf_getitimer
87 AUE_SYSCTL MSTD { int linux_gethostname(void); }
-88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \
- u_int len); } osethostname \
- sethostname_args int
+88 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, u_int len); }
89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); }
90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); }
91 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \
@@ -179,13 +172,13 @@
int protocol); }
98 AUE_CONNECT MSTD { int linux_connect(l_int s, \
struct l_sockaddr *name, l_int namelen); }
-99 AUE_ACCEPT MNOPROTO { int oaccept(int s, caddr_t name, \
- int *anamelen); } accept accept_args int
+99 AUE_ACCEPT MSTD { int linux_accept(l_int s, \
+ struct linux_accept_args *args); }
100 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); }
-101 AUE_SEND MNOPROTO { int osend(int s, caddr_t buf, int len, \
- int flags); }
-102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \
- int flags); }
+101 AUE_SEND MSTD { int linux_send(l_int s, \
+ struct linux_send_args *args); }
+102 AUE_RECV MSTD { int linux_recv(l_int s, \
+ struct linux_recv_args *args); }
103 AUE_NULL MSTD { int osf1_sigreturn( \
struct osigcontext *sigcntxp); }
104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \
@@ -217,16 +210,14 @@
122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday
123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); }
124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); }
-125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \
- size_t len, int flags, caddr_t from, \
- int *fromlenaddr); } recvfrom \
- recvfrom_args int
+125 AUE_RECVFROM MSTD { int linux_recvfrom(l_int s, \
+ struct linux_recvfrom_args *args); }
126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); }
127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); }
128 AUE_RENAME MSTD { int linux_rename(char *from, char *to); }
129 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \
l_ulong length); }
-130 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); }
+130 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); }
131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); }
132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); }
133 AUE_SENDTO MSTD { int osf1_sendto(int s, caddr_t buf, \
@@ -240,8 +231,8 @@
struct timeval *tptr); }
139 AUE_NULL UNIMPL
140 AUE_NULL UNIMPL
-141 AUE_GETPEERNAME MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \
- int *alen); }
+141 AUE_GETPEERNAME MSTD { int linux_getpeername(l_int s, \
+ struct linux_getpeername_args *args); }
142 AUE_NULL UNIMPL
143 AUE_NULL UNIMPL
144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \
@@ -252,9 +243,8 @@
147 AUE_SETSID MNOPROTO { int setsid(void); }
148 AUE_QUOTACTL MSTD { int linux_quotactl(void); }
149 AUE_NULL UNIMPL
-150 AUE_GETSOCKNAME MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \
- int *alen);} getsockname \
- getsockname_args int
+150 AUE_GETSOCKNAME MSTD { int linux_getsockname(l_int s, \
+ struct linux_getsockname_args *args);}
151 AUE_NULL UNIMPL
152 AUE_NULL UNIMPL
153 AUE_NULL UNIMPL
==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -219,11 +219,12 @@
}
/*
- * For ACPI < 2.0, use the RSDT. For ACPI >= 2.0, use the XSDT.
- * We map the XSDT and RSDT at page 1 in the crashdump area.
- * Page 0 is used to map in the headers of candidate ACPI tables.
+ * For ACPI >= 2.0, use the XSDT if it is available.
+ * Otherwise, use the RSDT. We map the XSDT or RSDT at page 1
+ * in the crashdump area. Page 0 is used to map in the
+ * headers of candidate ACPI tables.
*/
- if (rsdp->Revision >= 2) {
+ if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) {
/*
* AcpiOsGetRootPointer only verifies the checksum for
* the version 1.0 portion of the RSDP. Version 2.0 has
==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/apic_vector.S#4 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.107 2005/12/14 21:47:01 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $
*/
/*
@@ -188,11 +188,7 @@
jmp doreti
/*
- * Executed by a CPU when it receives an Xcpustop IPI from another CPU,
- *
- * - Signals its receipt.
- * - Waits for permission to restart.
- * - Signals its restart.
+ * Executed by a CPU when it receives an IPI_STOP from another CPU.
*/
.text
SUPERALIGN_TEXT
==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/db_trace.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,6 +192,7 @@
#define TRAP 1
#define INTERRUPT 2
#define SYSCALL 3
+#define TRAP_INTERRUPT 5
static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *);
static int db_numargs(struct amd64_frame *);
@@ -326,6 +327,12 @@
frame_type = INTERRUPT;
else if (strcmp(name, "Xfast_syscall") == 0)
frame_type = SYSCALL;
+ /* XXX: These are interrupts with trap frames. */
+ else if (strcmp(name, "Xtimerint") == 0 ||
+ strcmp(name, "Xcpustop") == 0 ||
+ strcmp(name, "Xrendezvous") == 0 ||
+ strcmp(name, "Xipi_intr_bitmap_handler") == 0)
+ frame_type = TRAP_INTERRUPT;
}
/*
@@ -357,6 +364,7 @@
db_printf("--- syscall");
decode_syscall(tf->tf_rax, td);
break;
+ case TRAP_INTERRUPT:
case INTERRUPT:
db_printf("--- interrupt");
break;
==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
@@ -73,6 +73,10 @@
* IRQs behave as PCI IRQs by default. We also assume that the pin for
* IRQ 0 is actually an ExtINT pin. The apic enumerators override the
* configuration of individual pins as indicated by their tables.
+ *
+ * Documentation for the I/O APIC: "82093AA I/O Advanced Programmable
+ * Interrupt Controller (IOAPIC)", May 1996, Intel Corp.
+ * ftp://download.intel.com/design/chipsets/datashts/29056601.pdf
*/
struct ioapic_intsrc {
@@ -443,7 +447,7 @@
uint32_t value;
/* Map the register window so we can access the device. */
- apic = (ioapic_t *)pmap_mapdev(addr, IOAPIC_MEM_REGION);
+ apic = pmap_mapdev(addr, IOAPIC_MEM_REGION);
mtx_lock_spin(&icu_lock);
value = ioapic_read(apic, IOAPIC_VER);
mtx_unlock_spin(&icu_lock);
==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list