Date: Tue, 29 Aug 2006 12:17:09 GMT From: "George V. Neville-Neil" <gnn@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 105257 for review Message-ID: <200608291217.k7TCH95C085460@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=105257 Change 105257 by gnn@gnn_devbox_fast_ipsec on 2006/08/29 12:16:35 Bring my branch up to date. Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sbin/setkey/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/pmap.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/Makefile#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/help.common#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/syscalls.master#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#10 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.amd64#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.i386#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.pc98#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kern.post.mk#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#12 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.amd64#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.arm#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.i386#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.pc98#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/README#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_hw.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_osdep.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ips/ips.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_ioctl.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_library.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_dev_z8530.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/udf/ecma167-udf.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_gpt.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/XBOX#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.isc#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.master#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.xenix#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_main.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/systrace_args.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_proto.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/libkern/strstr.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/asr/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/linux/Makefile#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/osf1/Makefile#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/stge/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpf.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bridgestp.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_enc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_faith.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gif.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gre.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_stf.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_tun.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_var.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/net_osdep.h#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_gif.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_core.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_core.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/key.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/keydb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_crypt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/pc98_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/ncr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_ioctl.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/NOTES#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_label.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/dirent.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/domain.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/extattr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/imgact.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/kobj.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/libkern.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mac_policy.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mutex.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#9 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/proc.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/protosw.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sched.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/socket.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/socketvar.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/stat.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sx.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysent.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/systm.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/time.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/umtx.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/device_pager.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/pmap.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sbin/setkey/Makefile#2 (text+ko) ==== @@ -25,11 +25,14 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sbin/setkey/Makefile,v 1.12 2005/10/13 17:57:34 ume Exp $ +# $FreeBSD: src/sbin/setkey/Makefile,v 1.13 2006/07/27 13:26:29 yar Exp $ + +.include <bsd.own.mk> PROG= setkey MAN= setkey.8 SRCS= setkey.c parse.y token.l +WARNS?= 1 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec YFLAGS= -d @@ -47,7 +50,11 @@ SRCS+= y.tab.h y.tab.h: parse.y -CFLAGS+= -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. +CFLAGS+= -DIPSEC_DEBUG -DYY_NO_UNPUT +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif +CFLAGS+= -I. DPADD+= ${LIBIPSEC} LDADD+= -lipsec CLEANFILES+= scriptdump y.tab.h @@ -56,8 +63,6 @@ LOCALPREFIX= /usr -WARNS= 1 - scriptdump: scriptdump.pl sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -203,15 +203,15 @@ /* * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn - * calls pmap_mapdev() to find the RSDP, we assume that we can use - * pmap_mapdev() to map the RSDP. + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif - rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -261,7 +261,7 @@ break; madt_unmap_table(rsdt); } - pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -335,7 +335,7 @@ madt_setup_local(void) { - madt = pmap_mapdev(madt_physaddr, madt_length); + madt = pmap_mapbios(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", (int)sizeof(madt->OemId), madt->OemId, ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 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! */ ); } ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/machdep.c#7 (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/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -665,6 +665,84 @@ * Low level helper routines..... ***************************************************/ +/* + * Determine the appropriate bits to set in a PTE or PDE for a specified + * caching mode. + */ +static int +pmap_cache_bits(int mode, boolean_t is_pde) +{ + int pat_flag, pat_index, cache_bits; + + /* The PAT bit is different for PTE's and PDE's. */ + pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; + + /* If we don't support PAT, map extended modes to older ones. */ + if (!(cpu_feature & CPUID_PAT)) { + switch (mode) { + case PAT_UNCACHEABLE: + case PAT_WRITE_THROUGH: + case PAT_WRITE_BACK: + break; + case PAT_UNCACHED: + case PAT_WRITE_COMBINING: + case PAT_WRITE_PROTECTED: + mode = PAT_UNCACHEABLE; + break; + } + } + + /* Map the caching mode to a PAT index. */ + switch (mode) { +#ifdef PAT_WORKS + case PAT_UNCACHEABLE: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_UNCACHED: + pat_index = 2; + break; + case PAT_WRITE_COMBINING: + pat_index = 5; + break; + case PAT_WRITE_PROTECTED: + pat_index = 4; + break; +#else + case PAT_UNCACHED: + case PAT_UNCACHEABLE: + case PAT_WRITE_PROTECTED: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_WRITE_COMBINING: + pat_index = 2; + break; +#endif + default: + panic("Unknown caching mode %d\n", mode); + } + + /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ + cache_bits = 0; + if (pat_index & 0x4) + cache_bits |= pat_flag; + if (pat_index & 0x2) + cache_bits |= PG_NC_PCD; + if (pat_index & 0x1) + cache_bits |= PG_NC_PWT; + return (cache_bits); +} #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -962,6 +1040,15 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } +PMAP_INLINE void +pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) +{ + pt_entry_t *pte; + + pte = vtopte(va); + pte_store(pte, pa | PG_RW | PG_V | PG_G | pmap_cache_bits(mode, 0)); +} + /* * Remove a page from the kernel pagetables. * Note: not SMP coherent. @@ -2506,7 +2593,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2525,8 +2611,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) @@ -2972,7 +3058,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3088,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. @@ -3119,6 +3188,46 @@ * Miscellaneous support routines follow */ +/* Adjust the cache mode for a 4KB page mapped via a PTE. */ +static __inline void +pmap_pte_attr(vm_offset_t va, int mode) +{ + pt_entry_t *pte; + u_int opte, npte; + + pte = vtopte(va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PTE, so we can just spin on updating the low 32-bits. + */ + do { + opte = *(u_int *)pte; + npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); + npte |= pmap_cache_bits(mode, 0); + } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); +} + +/* Adjust the cache mode for a 2MB page mapped via a PDE. */ +static __inline void +pmap_pde_attr(vm_offset_t va, int mode) +{ + pd_entry_t *pde; + u_int opde, npde; + + pde = pmap_pde(kernel_pmap, va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PDE, so we can just spin on updating the low 32-bits. + */ + do { + opde = *(u_int *)pde; + npde = opde & ~(PG_PDE_PAT | PG_NC_PCD | PG_NC_PWT); + npde |= pmap_cache_bits(mode, 1); + } while (npde != opde && !atomic_cmpset_int((u_int *)pde, opde, npde)); +} + /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This @@ -3126,12 +3235,15 @@ * NOT real memory. */ void * -pmap_mapdev(vm_paddr_t pa, vm_size_t size) +pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode) { vm_offset_t va, tmpva, offset; - /* If this fits within the direct map window, use it */ - if (pa < dmaplimit && (pa + size) < dmaplimit) + /* + * If this fits within the direct map window and use WB caching + * mode, use the direct map. + */ + if (pa < dmaplimit && (pa + size) < dmaplimit && mode == PAT_WRITE_BACK) return ((void *)PHYS_TO_DMAP(pa)); offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); @@ -3140,15 +3252,30 @@ panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pa = trunc_page(pa); for (tmpva = va; size > 0; ) { - pmap_kenter(tmpva, pa); + pmap_kenter_attr(tmpva, pa, mode); size -= PAGE_SIZE; tmpva += PAGE_SIZE; pa += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); + pmap_invalidate_cache(); return ((void *)(va + offset)); } +void * +pmap_mapdev(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_UNCACHEABLE)); +} + +void * +pmap_mapbios(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_WRITE_BACK)); +} + void pmap_unmapdev(vm_offset_t va, vm_size_t size) { @@ -3166,6 +3293,73 @@ kmem_free(kernel_map, base, size); } +int +pmap_change_attr(va, size, mode) + vm_offset_t va; + vm_size_t size; + int mode; +{ + vm_offset_t base, offset, tmpva; + pd_entry_t *pde; + pt_entry_t *pte; + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608291217.k7TCH95C085460>