PERFORCE change 122823 for review
Rui Paulo
rpaulo at FreeBSD.org
Wed Jul 4 01:59:16 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122823
Change 122823 by rpaulo at rpaulo_epsilon on 2007/07/04 01:58:27
IFC
Affected files ...
.. //depot/projects/soc2007/rpaulo-macbook/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files#16 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.arm#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.ia64#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.pc98#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.powerpc#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.sun4v#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options.amd64#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options.i386#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options.pc98#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_mtag.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_ruleset.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/crypto/via/padlock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_library.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/ispvar.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/if_nxge.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/if_nxge.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/build-version.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/version.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-debug.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-defs.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-list.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-os-pal.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-os-template.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xge-queue.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-channel.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-config.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-device.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-driver.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-event.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-fifo.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-mgmt.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-mgmtaux.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-mm.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-regs.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-ring.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-stats.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal-types.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/include/xgehal.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xge-osdep.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xge-queue.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-channel.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-config.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-device-fp.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-device.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-driver.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-fifo.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-mgmt.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-mm.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-ring.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgehal/xgehal-stats.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/xgell-version.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2560.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2661.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/snp/snp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axe.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axereg.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uark.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ugen.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhub.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umass.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_port.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_subr.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdi.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdi.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/wi/if_wi.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.h#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/conf/GENERIC#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_ing.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_ipr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_isppp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_conf.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_descrip.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_lockf.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_priv.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_smp.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sysv_sem.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty_pts.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty_pty.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty_tty.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/ipfw/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/nxge/Makefile#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/modules/pf/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/tmpfs/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_ethersubr.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_ppp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/pfkeyv2.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/_ieee80211.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_radiotap.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netatalk/aarp.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netatalk/ddp.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/in_pcb.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/in_pcb.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/in_proto.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_fw2.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_icmp.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_input.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_output.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/raw_ip.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_var.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#13 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_output.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah6.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_aesxcbcmac.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_aesxcbcmac.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_core.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_input.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_output.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp6.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_aesctr.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_aesctr.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_camellia.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_camellia.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_core.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_input.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_output.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_rijndael.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/esp_rijndael.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/icmp6.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_pcb.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_proto.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_input.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_ipsec.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_ipsec.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_output.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipcomp.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipcomp6.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipcomp_core.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipcomp_input.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipcomp_output.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipsec.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipsec.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ipsec6.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/raw_ip6.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_output.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec6.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/key.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/key_debug.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/keysock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/xform_ah.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netkey/key.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/key.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/key_debug.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/key_debug.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/key_var.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/keydb.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/keydb.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/keysock.c#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/netkey/keysock.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_bio.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pc98/conf/NOTES#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_arg.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/conf.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/mbuf.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/systm.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/dir.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#8 integrate
Differences ...
==== //depot/projects/soc2007/rpaulo-macbook/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.43 2007/07/01 11:38:26 gnn Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
# Directories to include in cscope name file and TAGS.
CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
i4b isa kern libkern modules net net80211 netatalk netatm \
- netgraph netinet netinet6 netipx netkey netnatm netncp \
+ netgraph netinet netinet6 netipx netnatm netncp \
netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
ufs vm ${ARCHDIR}
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#7 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.588 2007/06/17 04:27:45 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $");
/*
* Manages physical address maps.
@@ -210,7 +210,8 @@
vm_page_t m, vm_prot_t prot, vm_page_t mpte);
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq,
vm_offset_t sva, pd_entry_t ptepde, vm_page_t *free);
-static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde);
+static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde,
+ vm_page_t *free);
static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
vm_offset_t va);
static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m);
@@ -1895,10 +1896,9 @@
* Remove a single page from a process address space
*/
static void
-pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde)
+pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, vm_page_t *free)
{
pt_entry_t *pte;
- vm_page_t free = NULL;
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
if ((*pde & PG_V) == 0)
@@ -1906,9 +1906,8 @@
pte = pmap_pde_to_pte(pde, va);
if ((*pte & PG_V) == 0)
return;
- pmap_remove_pte(pmap, pte, va, *pde, &free);
+ pmap_remove_pte(pmap, pte, va, *pde, free);
pmap_invalidate_page(pmap, va);
- pmap_free_zero_pages(free);
}
/*
@@ -1947,7 +1946,7 @@
if (sva + PAGE_SIZE == eva) {
pde = pmap_pde(pmap, sva);
if (pde && (*pde & PG_PS) == 0) {
- pmap_remove_page(pmap, sva, pde);
+ pmap_remove_page(pmap, sva, pde, &free);
goto out;
}
}
@@ -2018,12 +2017,11 @@
}
}
out:
- if (anyvalid) {
+ if (anyvalid)
pmap_invalidate_all(pmap);
- pmap_free_zero_pages(free);
- }
vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
+ pmap_free_zero_pages(free);
}
/*
@@ -3003,9 +3001,9 @@
}
}
pmap_invalidate_all(pmap);
- pmap_free_zero_pages(free);
vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
+ pmap_free_zero_pages(free);
}
/*
==== //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#5 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.482 2007/06/14 17:14:25 delphij Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $
cpu HAMMER
ident GENERIC
@@ -75,6 +75,9 @@
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
+# CPU frequency control
+device cpufreq
+
# Bus support.
device acpi
device pci
==== //depot/projects/soc2007/rpaulo-macbook/amd64/conf/NOTES#3 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.65 2007/05/09 15:55:45 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
#
#
@@ -542,9 +542,9 @@
#XXX#device i4bipr
#XXX#options NI4BIPR=4
# enable VJ header compression detection for ipr i/f
-options IPR_VJ
+#XXX#options IPR_VJ
# enable logging of the first n IP packets to isdnd (n=32 here)
-options IPR_LOG=32
+#XXX#options IPR_LOG=32
#
# network driver for sync PPP over ISDN; requires an equivalent
# number of sppp device to be configured
==== //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.189 2007/06/17 05:55:53 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190 2007/06/30 14:58:56 imp Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -620,6 +620,18 @@
CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
},
{
+ /*
+ * Western Digital My Book 250GB (USB)
+ * hangs upon serial number probing.
+ * PR: 107495
+ */
+ {
+ T_DIRECT, SIP_MEDIA_FIXED, "WD",
+ "2500JB External", "*"
+ },
+ CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0
+ },
+ {
/* Default tagged queuing parameters for all devices */
{
T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
==== //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.215 2007/06/16 18:22:19 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224 2007/07/01 17:42:07 imp Exp $");
#include <sys/param.h>
@@ -457,6 +457,14 @@
},
{
/*
+ * iRiver U10 MP3 player
+ * PR: usb/92306
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "iriver", "U10*",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* X-Micro Flash Disk
* PR: usb/96901
*/
@@ -471,6 +479,62 @@
{T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*",
"1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
+ {
+ /*
+ * Denver MP3 player
+ * PR: usb/107101
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "DENVER", "MP3 PLAYER",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * Philips USB Key Audio KEY013
+ * PR: usb/68412
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "PHILIPS", "Key*", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE | DA_Q_NO_PREVENT
+ },
+ {
+ /*
+ * JNC MP3 Player
+ * PR: usb/94439
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "JNC*" , "MP3 Player*",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * SAMSUNG MP0402H
+ * PR: usb/108427
+ */
+ {T_DIRECT, SIP_MEDIA_FIXED, "SAMSUNG", "MP0402H", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * I/O Magic USB flash - Giga Bank
+ * PR: usb/108810
+ */
+ {T_DIRECT, SIP_MEDIA_FIXED, "GS-Magic", "stor*", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * JoyFly 128mb USB Flash Drive
+ * PR: 96133
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB 2.0", "Flash Disk*",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * ChipsBnk usb stick
+ * PR: 103702
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "ChipsBnk", "USB*",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
};
static disk_strategy_t dastrategy;
==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1437 2007/06/27 02:34:22 rafan Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1440 2007/07/03 12:13:42 gnn Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -496,8 +496,7 @@
options INET #Internet communications protocols
options INET6 #IPv6 communications protocols
options IPSEC #IP security
-options IPSEC_ESP #IP security (crypto; define w/ IPSEC)
-options IPSEC_DEBUG #debug for IP security
+#options IPSEC_DEBUG #debug for IP security
#
# Set IPSEC_FILTERGIF to force packets coming through a gif tunnel
# to be processed by any configured packet filtering (ipfw, ipf).
@@ -509,8 +508,6 @@
#
#options IPSEC_FILTERGIF #filter ipsec packets from a tunnel
-#options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
-
options IPX #IPX/SPX communications protocols
options NCP #NetWare Core protocol
@@ -786,7 +783,7 @@
device pfsync #synchronization interface for PF
options PF_MPSAFE_UGID #Workaround LOR with user/group rules
device carp #Common Address Redundancy Protocol
-device enc #IPSec interface (needs FAST_IPSEC)
+device enc #IPsec interface
device ppp #Point-to-point protocol
options PPP_BSDCOMP #PPP BSD-compress support
options PPP_DEFLATE #PPP zlib/deflate/gzip support
@@ -880,8 +877,8 @@
# carried in TCP option 19. This option is commonly used to protect
# TCP sessions (e.g. BGP) where IPSEC is not available nor desirable.
# This is enabled on a per-socket basis using the TCP_MD5SIG socket option.
-# This requires the use of 'device crypto', 'options FAST_IPSEC' or 'options
-# IPSEC', and 'device cryptodev'.
+# This requires the use of 'device crypto', 'options IPSEC'
+# or 'device cryptodev'.
#options TCP_SIGNATURE #include support for RFC 2385
# DUMMYNET enables the "dummynet" bandwidth limiter. You need IPFIREWALL
@@ -1905,6 +1902,7 @@
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
device le # AMD Am7900 LANCE and Am79C9xx PCnet
+device nxge # Neterion Xframe 10GbE Server/Storage Adapter
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
@@ -2518,7 +2516,7 @@
# crypto subsystem
#
# This is a port of the OpenBSD crypto framework. Include this when
-# configuring FAST_IPSEC and when you have a h/w crypto device to accelerate
+# configuring IPSEC and when you have a h/w crypto device to accelerate
# user applications that link to OpenSSL.
#
# Drivers are ports from OpenBSD with some simple enhancements that have
==== //depot/projects/soc2007/rpaulo-macbook/conf/files#16 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1231 2007/07/04 00:18:38 bz Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -327,23 +327,25 @@
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/net/pf_if.c optional pf \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_subr.c optional pf \
- compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/net/pf_ioctl.c optional pf \
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/net/pf_norm.c optional pf \
compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_osfp.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ruleset.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_subr.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/net/pf_table.c optional pf \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_osfp.c optional pf \
- compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/netinet/in4_cksum.c optional pf inet
-crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp
-crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp
-crypto/camellia/camellia.c optional crypto | ipsec ipsec_esp
-crypto/camellia/camellia-api.c optional crypto | ipsec ipsec_esp
-crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmb
-crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmb
+crypto/blowfish/bf_ecb.c optional ipsec
+crypto/blowfish/bf_skey.c optional crypto | ipsec
+crypto/camellia/camellia.c optional crypto | ipsec
+crypto/camellia/camellia-api.c optional crypto | ipsec
+crypto/des/des_ecb.c optional crypto | ipsec | netsmb
+crypto/des/des_setkey.c optional crypto | ipsec | netsmb
crypto/rc4/rc4.c optional netgraph_mppc_encryption
crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
ipsec | random | wlan_ccmp
@@ -811,6 +813,17 @@
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
dev/nge/if_nge.c optional nge
+dev/nxge/if_nxge.c optional nxge
+dev/nxge/xgehal/xgehal-device.c optional nxge
+dev/nxge/xgehal/xgehal-mm.c optional nxge
+dev/nxge/xgehal/xge-queue.c optional nxge
+dev/nxge/xgehal/xgehal-driver.c optional nxge
+dev/nxge/xgehal/xgehal-ring.c optional nxge
+dev/nxge/xgehal/xgehal-channel.c optional nxge
+dev/nxge/xgehal/xgehal-fifo.c optional nxge
+dev/nxge/xgehal/xgehal-stats.c optional nxge
+dev/nxge/xgehal/xgehal-config.c optional nxge
+dev/nxge/xgehal/xgehal-mgmt.c optional nxge
dev/nmdm/nmdm.c optional nmdm
dev/nsp/nsp.c optional nsp
dev/nsp/nsp_pccard.c optional nsp pccard
@@ -1207,7 +1220,6 @@
fs/tmpfs/tmpfs_fifoops.c optional tmpfs
fs/tmpfs/tmpfs_vfsops.c optional tmpfs
fs/tmpfs/tmpfs_subr.c optional tmpfs
-fs/tmpfs/tmpfs_uma.c optional tmpfs
gdb/gdb_cons.c optional gdb
gdb/gdb_main.c optional gdb
gdb/gdb_packet.c optional gdb
@@ -1298,11 +1310,11 @@
i4b/driver/i4b_trace.c optional i4btrc
i4b/driver/i4b_rbch.c optional i4brbch
i4b/driver/i4b_tel.c optional i4btel
-i4b/driver/i4b_ipr.c optional i4bipr
+#XXXBZ#i4b/driver/i4b_ipr.c optional i4bipr
net/slcompress.c optional i4bipr | i4bisppp
i4b/driver/i4b_ctl.c optional i4bctl
-i4b/driver/i4b_ing.c optional i4bing
-i4b/driver/i4b_isppp.c optional i4bisppp
+#XXXBZ#i4b/driver/i4b_ing.c optional i4bing
+#XXXBZ#i4b/driver/i4b_isppp.c optional i4bisppp
#
# isdn4bsd CAPI driver
#
@@ -1575,7 +1587,8 @@
net/if_edsc.c optional edsc
net/if_ef.c optional ef
net/if_enc.c optional enc
-net/if_ethersubr.c optional ether
+net/if_ethersubr.c optional ether \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
net/if_faith.c optional faith
net/if_fddisubr.c optional fddi
net/if_fwsubr.c optional fwip
@@ -1816,12 +1829,12 @@
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
-netinet/ip_fw2.c optional ipfirewall
+netinet/ip_fw2.c optional ipfirewall \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/ip_fw_pfil.c optional ipfirewall
netinet/ip_icmp.c optional inet
netinet/ip_input.c optional inet
netinet/ip_ipsec.c optional ipsec
-netinet/ip_ipsec.c optional fast_ipsec
netinet/ip_mroute.c optional mrouting inet | mrouting inet6
netinet/ip_options.c optional inet
netinet/ip_output.c optional inet
@@ -1856,17 +1869,7 @@
netinet/libalias/alias_mod.c optional libalias | netgraph_nat
netinet/libalias/alias_proxy.c optional libalias | netgraph_nat
netinet/libalias/alias_util.c optional libalias | netgraph_nat
-netinet6/ah_aesxcbcmac.c optional ipsec
-netinet6/ah_core.c optional ipsec
-netinet6/ah_input.c optional ipsec
-netinet6/ah_output.c optional ipsec
netinet6/dest6.c optional inet6
-netinet6/esp_aesctr.c optional ipsec ipsec_esp
-netinet6/esp_core.c optional ipsec ipsec_esp
-netinet6/esp_input.c optional ipsec ipsec_esp
-netinet6/esp_output.c optional ipsec ipsec_esp
-netinet6/esp_rijndael.c optional ipsec ipsec_esp
-netinet6/esp_camellia.c optional ipsec ipsec_esp
netinet6/frag6.c optional inet6
netinet6/icmp6.c optional inet6
netinet6/in6.c optional inet6
@@ -1882,10 +1885,7 @@
netinet6/ip6_input.c optional inet6
netinet6/ip6_mroute.c optional mrouting inet6
netinet6/ip6_output.c optional inet6
-netinet6/ipcomp_core.c optional ipsec
-netinet6/ipcomp_input.c optional ipsec
-netinet6/ipcomp_output.c optional ipsec
-netinet6/ipsec.c optional ipsec
+netinet6/ip6_ipsec.c optional ipsec
netinet6/mld6.c optional inet6
netinet6/nd6.c optional inet6
netinet6/nd6_nbr.c optional inet6
@@ -1896,18 +1896,18 @@
netinet6/sctp6_usrreq.c optional inet6 sctp
netinet6/udp6_output.c optional inet6
netinet6/udp6_usrreq.c optional inet6
-netipsec/ipsec.c optional fast_ipsec
-netipsec/ipsec_input.c optional fast_ipsec
-netipsec/ipsec_mbuf.c optional fast_ipsec
-netipsec/ipsec_output.c optional fast_ipsec
-netipsec/key.c optional fast_ipsec
-netipsec/key_debug.c optional fast_ipsec
-netipsec/keysock.c optional fast_ipsec
-netipsec/xform_ah.c optional fast_ipsec
-netipsec/xform_esp.c optional fast_ipsec
-netipsec/xform_ipcomp.c optional fast_ipsec
-netipsec/xform_ipip.c optional fast_ipsec
-netipsec/xform_tcp.c optional fast_ipsec tcp_signature
+netipsec/ipsec.c optional ipsec
+netipsec/ipsec_input.c optional ipsec
+netipsec/ipsec_mbuf.c optional ipsec
+netipsec/ipsec_output.c optional ipsec
+netipsec/key.c optional ipsec
+netipsec/key_debug.c optional ipsec
+netipsec/keysock.c optional ipsec
+netipsec/xform_ah.c optional ipsec
+netipsec/xform_esp.c optional ipsec
+netipsec/xform_ipcomp.c optional ipsec
+netipsec/xform_ipip.c optional ipsec
+netipsec/xform_tcp.c optional ipsec tcp_signature
netipx/ipx.c optional ipx
netipx/ipx_cksum.c optional ipx
netipx/ipx_input.c optional ipx
@@ -1917,10 +1917,6 @@
netipx/ipx_usrreq.c optional ipx
netipx/spx_debug.c optional ipx
netipx/spx_usrreq.c optional ipx
-netkey/key.c optional ipsec
-netkey/key_debug.c optional ipsec
-netkey/keydb.c optional ipsec
-netkey/keysock.c optional ipsec
netnatm/natm.c optional natm
netnatm/natm_pcb.c optional natm
netnatm/natm_proto.c optional natm
@@ -1968,7 +1964,7 @@
nfsserver/nfs_srvsubs.c optional nfsserver
nfsserver/nfs_syscalls.c optional nfsserver
# crypto support
-opencrypto/cast.c optional crypto | ipsec ipsec_esp
+opencrypto/cast.c optional crypto | ipsec
opencrypto/criov.c optional crypto
opencrypto/crypto.c optional crypto
opencrypto/cryptodev.c optional cryptodev
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.104 2007/06/11 00:38:05 marcel Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.105 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -135,9 +135,8 @@
amd64/isa/nmi.c standard
amd64/pci/pci_bus.c optional pci
amd64/pci/pci_cfgreg.c optional pci
-crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
- netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/acpica/acpi_if.m standard
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/asmc/asmc.c optional asmc isa
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.arm#2 (text+ko) ====
@@ -1,7 +1,6 @@
-# $FreeBSD: src/sys/conf/files.arm,v 1.14 2006/12/18 05:45:23 mjacob Exp $
-crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
- netsmb
+# $FreeBSD: src/sys/conf/files.arm,v 1.15 2007/07/03 12:13:42 gnn Exp $
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
arm/arm/autoconf.c standard
arm/arm/bcopy_page.S standard
arm/arm/bcopyinout.S standard
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.577 2007/06/11 00:38:05 marcel Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.578 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -132,11 +132,11 @@
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
-bf_enc.o optional crypto | ipsec ipsec_esp \
+bf_enc.o optional crypto | ipsec \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional crypto | ipsec ipsec_esp | netsmb
+crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.ia64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.ia64,v 1.91 2007/04/09 14:02:18 kan Exp $
+# $FreeBSD: src/sys/conf/files.ia64,v 1.92 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -42,9 +42,8 @@
contrib/ia64/libuwx/src/uwx_trace.c standard
contrib/ia64/libuwx/src/uwx_uinfo.c standard
contrib/ia64/libuwx/src/uwx_utable.c standard
-crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
- netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.pc98#4 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.355 2007/06/11 00:38:06 marcel Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.356 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -93,11 +93,11 @@
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
-bf_enc.o optional crypto | ipsec ipsec_esp \
+bf_enc.o optional crypto | ipsec \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional crypto | ipsec ipsec_esp | netsmb
+crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
dev/aic/aic_cbus.c optional aic isa
dev/ar/if_ar.c optional ar
dev/ar/if_ar_pci.c optional ar pci
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.powerpc#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.64 2007/04/06 11:29:52 nyan Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.65 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -75,8 +75,8 @@
powerpc/powerpc/db_hwwatch.c optional ddb
powerpc/powerpc/db_trace.c optional ddb
-crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional ipsec ipsec_esp | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/ofw/openfirm.c standard
dev/ofw/ofw_bus_if.m standard
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.91 2007/06/18 21:49:42 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.92 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -32,9 +32,8 @@
no-obj no-implicit-rule before-depend \
clean "opt_ah.h"
#
-crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
- netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc
==== //depot/projects/soc2007/rpaulo-macbook/conf/files.sun4v#4 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sun4v,v 1.10 2007/06/18 21:49:42 marius Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.11 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -18,9 +18,8 @@
clean "ukbdmap.h"
#
#
-crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \
- netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/ofw/ofw_bus_if.m standard
dev/ofw/ofw_bus_subr.c standard
dev/ofw/ofw_console.c optional ofw_console
==== //depot/projects/soc2007/rpaulo-macbook/conf/options#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $
+# $FreeBSD: src/sys/conf/options,v 1.599 2007/07/04 00:18:38 bz Exp $
#
# On the handling of kernel options
#
@@ -358,10 +358,8 @@
INET opt_inet.h
INET6 opt_inet6.h
IPSEC opt_ipsec.h
-IPSEC_ESP opt_ipsec.h
IPSEC_DEBUG opt_ipsec.h
IPSEC_FILTERGIF opt_ipsec.h
-FAST_IPSEC opt_ipsec.h
IPDIVERT
DUMMYNET opt_ipdn.h
IPFILTER opt_ipfilter.h
@@ -733,9 +731,9 @@
NI4BTRC opt_i4b.h
NI4BRBCH opt_i4b.h
NI4BTEL opt_i4b.h
-NI4BIPR opt_i4b.h
-NI4BING opt_i4b.h
-NI4BISPPP opt_i4b.h
+#XXXBZ#NI4BIPR opt_i4b.h
+#XXXBZ#NI4BING opt_i4b.h
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list