PERFORCE change 120186 for review
Sam Leffler
sam at FreeBSD.org
Mon May 21 18:20:40 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120186
Change 120186 by sam at sam_laptop on 2007/05/21 18:19:32
IFC @ 120185 (gcc 42 and symbol versioning)
Affected files ...
.. //depot/projects/wifi/Makefile.inc1#34 integrate
.. //depot/projects/wifi/UPDATING#29 integrate
.. //depot/projects/wifi/etc/defaults/periodic.conf#9 integrate
.. //depot/projects/wifi/etc/periodic/daily/480.status-ntpd#1 branch
.. //depot/projects/wifi/lib/libc/Makefile#10 integrate
.. //depot/projects/wifi/lib/libc/amd64/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/arm/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/gmon/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/i386/Symbol.map#4 integrate
.. //depot/projects/wifi/lib/libc/net/Symbol.map#4 integrate
.. //depot/projects/wifi/lib/libc/net/ether_addr.c#2 integrate
.. //depot/projects/wifi/lib/libc/net/ethers.3#3 integrate
.. //depot/projects/wifi/lib/libc/powerpc/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc_r/Makefile#7 integrate
.. //depot/projects/wifi/lib/libpthread/Makefile#6 integrate
.. //depot/projects/wifi/lib/libpthread/pthread.map#7 integrate
.. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#9 integrate
.. //depot/projects/wifi/lib/librt/Makefile#3 integrate
.. //depot/projects/wifi/lib/libthr/Makefile#12 integrate
.. //depot/projects/wifi/lib/libthr/pthread.map#9 integrate
.. //depot/projects/wifi/lib/libthread_db/Makefile#5 integrate
.. //depot/projects/wifi/lib/msun/Makefile#15 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Makefile#8 integrate
.. //depot/projects/wifi/share/man/man5/periodic.conf.5#9 integrate
.. //depot/projects/wifi/share/mk/bsd.lib.mk#10 integrate
.. //depot/projects/wifi/share/mk/bsd.libnames.mk#12 integrate
.. //depot/projects/wifi/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/wifi/share/mk/bsd.symver.mk#3 integrate
.. //depot/projects/wifi/sys/amd64/amd64/machdep.c#19 integrate
.. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#20 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#19 integrate
.. //depot/projects/wifi/sys/amd64/include/md_var.h#5 integrate
.. //depot/projects/wifi/sys/amd64/include/smp.h#10 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#13 integrate
.. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#17 integrate
.. //depot/projects/wifi/sys/arm/arm/machdep.c#12 integrate
.. //depot/projects/wifi/sys/arm/arm/pmap.c#20 integrate
.. //depot/projects/wifi/sys/arm/include/asm.h#5 integrate
.. //depot/projects/wifi/sys/arm/include/pmap.h#13 integrate
.. //depot/projects/wifi/sys/arm/include/profile.h#3 integrate
.. //depot/projects/wifi/sys/boot/i386/boot2/Makefile#4 integrate
.. //depot/projects/wifi/sys/cam/cam_periph.c#9 integrate
.. //depot/projects/wifi/sys/cam/cam_xpt.c#20 integrate
.. //depot/projects/wifi/sys/cam/cam_xpt.h#6 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_cd.c#9 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_ch.c#6 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#14 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_pass.c#6 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_pt.c#5 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#9 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#7 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_targ_bh.c#6 integrate
.. //depot/projects/wifi/sys/coda/coda_vnops.c#15 integrate
.. //depot/projects/wifi/sys/coda/coda_vnops.h#6 integrate
.. //depot/projects/wifi/sys/compat/ia32/ia32_sysvec.c#6 integrate
.. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#17 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_misc.c#16 integrate
.. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#11 integrate
.. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#11 integrate
.. //depot/projects/wifi/sys/conf/Makefile.amd64#9 integrate
.. //depot/projects/wifi/sys/conf/Makefile.arm#13 integrate
.. //depot/projects/wifi/sys/conf/Makefile.i386#9 integrate
.. //depot/projects/wifi/sys/conf/Makefile.ia64#8 integrate
.. //depot/projects/wifi/sys/conf/Makefile.pc98#9 integrate
.. //depot/projects/wifi/sys/conf/Makefile.powerpc#10 integrate
.. //depot/projects/wifi/sys/conf/Makefile.sparc64#8 integrate
.. //depot/projects/wifi/sys/conf/Makefile.sun4v#3 integrate
.. //depot/projects/wifi/sys/conf/NOTES#38 integrate
.. //depot/projects/wifi/sys/conf/files#48 edit
.. //depot/projects/wifi/sys/conf/kern.mk#7 integrate
.. //depot/projects/wifi/sys/conf/kern.pre.mk#16 integrate
.. //depot/projects/wifi/sys/conf/kmod.mk#23 integrate
.. //depot/projects/wifi/sys/conf/options#32 edit
.. //depot/projects/wifi/sys/dev/acpica/acpi.c#25 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_hpet.c#5 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpivar.h#18 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bcefw.h#3 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#13 integrate
.. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#9 integrate
.. //depot/projects/wifi/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/wifi/sys/dev/de/if_devar.h#3 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82540.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82541.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82541.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82542.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82543.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82543.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82575.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_82575.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_mac.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_mac.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_manage.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_manage.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_nvm.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_nvm.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_regs.h#2 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.c#23 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.h#12 integrate
.. //depot/projects/wifi/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/wifi/sys/dev/firewire/firewirereg.h#6 integrate
.. //depot/projects/wifi/sys/dev/hptmv/ioctl.c#4 integrate
.. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#29 integrate
.. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#14 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfi_cam.c#1 branch
.. //depot/projects/wifi/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfivar.h#4 integrate
.. //depot/projects/wifi/sys/dev/mmc/mmc.c#2 integrate
.. //depot/projects/wifi/sys/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/wifi/sys/dev/mmc/mmcvar.h#2 integrate
.. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#14 integrate
.. //depot/projects/wifi/sys/dev/pci/pci.c#29 integrate
.. //depot/projects/wifi/sys/dev/pci/pci_private.h#8 integrate
.. //depot/projects/wifi/sys/dev/pci/pcireg.h#16 integrate
.. //depot/projects/wifi/sys/dev/sound/isa/mss.c#13 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/envy24.c#6 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/envy24ht.c#5 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#7 integrate
.. //depot/projects/wifi/sys/dev/twa/tw_osl.h#4 integrate
.. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#7 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_bus_pci.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/rt2573_ucode.h#1 branch
.. //depot/projects/wifi/sys/dev/usb/ufoma.c#3 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#17 integrate
.. //depot/projects/wifi/sys/fs/smbfs/smbfs_io.c#8 integrate
.. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#8 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#20 integrate
.. //depot/projects/wifi/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/wifi/sys/i386/Makefile#2 integrate
.. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#12 integrate
.. //depot/projects/wifi/sys/i386/i386/machdep.c#22 integrate
.. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#24 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#23 integrate
.. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#14 integrate
.. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#22 integrate
.. //depot/projects/wifi/sys/i386/include/proc.h#4 integrate
.. //depot/projects/wifi/sys/i386/include/smp.h#10 integrate
.. //depot/projects/wifi/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/wifi/sys/ia64/ia64/machdep.c#16 integrate
.. //depot/projects/wifi/sys/ia64/ia64/mca.c#5 integrate
.. //depot/projects/wifi/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/wifi/sys/ia64/ia64/trap.c#12 integrate
.. //depot/projects/wifi/sys/kern/Make.tags.inc#4 integrate
.. //depot/projects/wifi/sys/kern/imgact_elf.c#14 integrate
.. //depot/projects/wifi/sys/kern/init_main.c#17 integrate
.. //depot/projects/wifi/sys/kern/kern_clock.c#10 integrate
.. //depot/projects/wifi/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/wifi/sys/kern/kern_exit.c#19 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#17 integrate
.. //depot/projects/wifi/sys/kern/kern_lock.c#19 integrate
.. //depot/projects/wifi/sys/kern/kern_malloc.c#13 integrate
.. //depot/projects/wifi/sys/kern/kern_mib.c#8 integrate
.. //depot/projects/wifi/sys/kern/kern_mutex.c#14 integrate
.. //depot/projects/wifi/sys/kern/kern_resource.c#11 integrate
.. //depot/projects/wifi/sys/kern/kern_rwlock.c#7 integrate
.. //depot/projects/wifi/sys/kern/kern_sx.c#9 integrate
.. //depot/projects/wifi/sys/kern/kern_synch.c#15 integrate
.. //depot/projects/wifi/sys/kern/kern_thread.c#17 integrate
.. //depot/projects/wifi/sys/kern/subr_lock.c#5 integrate
.. //depot/projects/wifi/sys/kern/subr_prof.c#5 integrate
.. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#12 integrate
.. //depot/projects/wifi/sys/kern/subr_trap.c#10 integrate
.. //depot/projects/wifi/sys/kern/subr_turnstile.c#10 integrate
.. //depot/projects/wifi/sys/kern/subr_witness.c#27 integrate
.. //depot/projects/wifi/sys/kern/uipc_domain.c#9 integrate
.. //depot/projects/wifi/sys/kern/uipc_mbuf.c#20 integrate
.. //depot/projects/wifi/sys/kern/uipc_sockbuf.c#5 integrate
.. //depot/projects/wifi/sys/kern/uipc_socket.c#29 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#24 integrate
.. //depot/projects/wifi/sys/kern/vfs_bio.c#24 integrate
.. //depot/projects/wifi/sys/kern/vfs_default.c#25 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#39 integrate
.. //depot/projects/wifi/sys/kern/vfs_vnops.c#21 integrate
.. //depot/projects/wifi/sys/kern/vnode_if.src#14 integrate
.. //depot/projects/wifi/sys/modules/mfi/Makefile#3 integrate
.. //depot/projects/wifi/sys/modules/mfi/mfip/Makefile#1 branch
.. //depot/projects/wifi/sys/modules/netgraph/Makefile#11 integrate
.. //depot/projects/wifi/sys/modules/netgraph/car/Makefile#1 branch
.. //depot/projects/wifi/sys/modules/rum/Makefile#1 branch
.. //depot/projects/wifi/sys/net/ethernet.h#5 integrate
.. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#4 integrate
.. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#3 integrate
.. //depot/projects/wifi/sys/net/if.c#28 integrate
.. //depot/projects/wifi/sys/net/if.h#11 integrate
.. //depot/projects/wifi/sys/net/if_fwsubr.c#13 integrate
.. //depot/projects/wifi/sys/net/if_lagg.c#4 integrate
.. //depot/projects/wifi/sys/net/if_lagg.h#4 integrate
.. //depot/projects/wifi/sys/net/if_var.h#23 integrate
.. //depot/projects/wifi/sys/netgraph/ng_car.c#1 branch
.. //depot/projects/wifi/sys/netgraph/ng_car.h#1 branch
.. //depot/projects/wifi/sys/netgraph/ng_fec.c#9 integrate
.. //depot/projects/wifi/sys/netgraph/ng_mppc.c#7 integrate
.. //depot/projects/wifi/sys/netinet/icmp6.h#6 integrate
.. //depot/projects/wifi/sys/netinet/ip_input.c#18 integrate
.. //depot/projects/wifi/sys/netinet/sctp.h#5 integrate
.. //depot/projects/wifi/sys/netinet/sctp_asconf.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_auth.c#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_constants.h#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/wifi/sys/netinet/sctp_timer.c#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_uio.h#8 integrate
.. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#8 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/wifi/sys/netinet/tcp.h#12 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#25 integrate
.. //depot/projects/wifi/sys/netinet/tcp_output.c#16 integrate
.. //depot/projects/wifi/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/wifi/sys/netinet/tcp_subr.c#29 integrate
.. //depot/projects/wifi/sys/netinet/tcp_syncache.c#17 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timer.c#15 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timer.h#7 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/wifi/sys/netinet/tcp_var.h#20 integrate
.. //depot/projects/wifi/sys/netinet/udp_usrreq.c#19 integrate
.. //depot/projects/wifi/sys/netinet6/icmp6.c#16 integrate
.. //depot/projects/wifi/sys/netinet6/in6_proto.c#11 integrate
.. //depot/projects/wifi/sys/netinet6/ip6_input.c#11 integrate
.. //depot/projects/wifi/sys/netinet6/nd6.c#13 integrate
.. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#8 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#18 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#20 integrate
.. //depot/projects/wifi/sys/pc98/conf/GENERIC#18 integrate
.. //depot/projects/wifi/sys/pc98/pc98/machdep.c#11 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#16 integrate
.. //depot/projects/wifi/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/wifi/sys/sparc64/include/smp.h#4 integrate
.. //depot/projects/wifi/sys/sparc64/include/ver.h#3 integrate
.. //depot/projects/wifi/sys/sparc64/pci/ofw_pcibus.c#8 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/identcpu.c#6 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#14 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/mem.c#4 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#7 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#15 integrate
.. //depot/projects/wifi/sys/sun4v/include/cache.h#2 delete
.. //depot/projects/wifi/sys/sun4v/include/iommureg.h#2 delete
.. //depot/projects/wifi/sys/sun4v/include/iommuvar.h#2 delete
.. //depot/projects/wifi/sys/sun4v/include/ofw_upa.h#2 delete
.. //depot/projects/wifi/sys/sun4v/include/pmap.h#2 integrate
.. //depot/projects/wifi/sys/sun4v/include/upa.h#2 integrate
.. //depot/projects/wifi/sys/sun4v/include/ver.h#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/bus_machdep.c#3 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/hviommu.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/nexus.c#3 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/tick.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/tte_hash.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/vnex.c#3 integrate
.. //depot/projects/wifi/sys/sys/lockf.h#5 integrate
.. //depot/projects/wifi/sys/sys/param.h#28 integrate
.. //depot/projects/wifi/sys/sys/sx.h#8 integrate
.. //depot/projects/wifi/sys/sys/sysctl.h#10 integrate
.. //depot/projects/wifi/sys/sys/sysent.h#7 integrate
.. //depot/projects/wifi/sys/sys/systm.h#22 integrate
.. //depot/projects/wifi/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/wifi/sys/sys/vnode.h#32 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#18 integrate
.. //depot/projects/wifi/sys/vm/swap_pager.c#17 integrate
.. //depot/projects/wifi/sys/vm/uma_core.c#23 integrate
.. //depot/projects/wifi/sys/vm/vm_contig.c#13 integrate
.. //depot/projects/wifi/sys/vm/vm_fault.c#16 integrate
.. //depot/projects/wifi/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/wifi/sys/vm/vm_map.c#16 integrate
.. //depot/projects/wifi/sys/vm/vm_meter.c#10 integrate
.. //depot/projects/wifi/sys/vm/vm_mmap.c#11 integrate
.. //depot/projects/wifi/sys/vm/vm_object.c#20 integrate
.. //depot/projects/wifi/sys/vm/vm_page.c#18 integrate
.. //depot/projects/wifi/sys/vm/vm_pageout.c#12 integrate
.. //depot/projects/wifi/sys/vm/vm_pageq.c#8 integrate
.. //depot/projects/wifi/sys/vm/vm_zeroidle.c#11 integrate
.. //depot/projects/wifi/sys/vm/vnode_pager.c#24 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/net/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-ether.c#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-ether.t#1 branch
.. //depot/projects/wifi/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#7 integrate
Differences ...
==== //depot/projects/wifi/Makefile.inc1#34 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1016,7 +1016,7 @@
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam lib/libpthread \
+ lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
@@ -1135,18 +1135,14 @@
delete-old-files:
@echo ">>> Removing old files (only deletes safe to delete libs)"
-.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ chflags noschg "./$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}" || true; \
fi; \
- fi
-.endfor
+ done)
# Remove catpages without corresponding manpages.
@3<&0; \
find ${DESTDIR}/usr/share/man/cat* ! -type d | \
@@ -1161,11 +1157,11 @@
check-old-files:
@echo ">>> Checking for old files"
-.for file in ${OLD_FILES}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done)
# Check for catpages without corresponding manpages.
@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
@@ -1179,25 +1175,21 @@
delete-old-libs:
@echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ chflags noschg "./$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}" || true; \
fi; \
- fi
-.endfor
+ done)
@echo ">>> Old libraries removed"
check-old-libs:
@echo ">>> Checking for old libraries"
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done)
delete-old-dirs:
@echo ">>> Removing old directories"
==== //depot/projects/wifi/UPDATING#29 (text+ko) ====
@@ -21,6 +21,19 @@
developers choose to disable these features on build machines
to maximize performance.
+20070513:
+ Symbol versioning is enabled by default. To disable it, use
+ option WITHOUT_SYMVER. It is not advisable to attempt to
+ disable symbol versioning once it is enabled; your installworld
+ will break because a symbol version-less libc will get installed
+ before the install tools. As a result, the old install tools,
+ which previously had symbol dependencies to FBSD_1.0, will fail
+ because the freshly installed libc will not have them.
+
+ The default threading library has been changed to libthr. If
+ you wish to have libpthread as your default, use option
+ DEFAULT_THREAD_LIB=libpthread for the buildworld.
+
20070423:
The ABI breakage in sendmail(8)'s libmilter has been repaired
so it is no longer necessary to recompile mail filters (aka,
@@ -773,4 +786,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $
+$FreeBSD: src/UPDATING,v 1.490 2007/05/13 14:41:48 deischen Exp $
==== //depot/projects/wifi/etc/defaults/periodic.conf#9 (text+ko) ====
@@ -13,7 +13,7 @@
# For a more detailed explanation of all the periodic.conf variables, please
# refer to the periodic.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $
#
# What files override these defaults ?
@@ -130,6 +130,9 @@
daily_status_named_enable="YES"
daily_status_named_usedns="YES" # DNS lookups are ok
+# 480.status-ntpd
+daily_status_ntpd_enable="NO" # Check NTP status
+
# 500.queuerun
daily_queuerun_enable="YES" # Run mail queue
daily_submit_queuerun="YES" # Also submit queue
==== //depot/projects/wifi/lib/libc/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.69 2007/03/04 12:25:03 simon Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.70 2007/05/13 14:12:38 deischen Exp $
SHLIBDIR?= /lib
@@ -76,11 +76,9 @@
CFLAGS+=-D_FREEFALL_CONFIG
.endif
-.if defined(SYMVER_ENABLED)
VERSION_DEF=${.CURDIR}/Versions.def
SYMBOL_MAPS=${SYM_MAPS}
CFLAGS+= -DSYMBOL_VERSIONING
-.endif
# If there are no machine dependent sources, append all the
# machine-independent sources:
==== //depot/projects/wifi/lib/libc/amd64/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $
+ * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ .mcount;
_setjmp;
_longjmp;
fabs;
==== //depot/projects/wifi/lib/libc/arm/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $
+ * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ _mcount;
_setjmp;
_longjmp;
alloca;
@@ -22,7 +23,7 @@
setjmp;
longjmp;
sigsetjmp;
- siglongjmp
+ siglongjmp;
htonl;
__htonl;
htons;
@@ -65,4 +66,26 @@
__sys_fork;
_fork;
_sbrk;
+
+ /* softfloat */
+ __addsf3;
+ __adddf3;
+ __subsf3;
+ __subdf3;
+ __mulsf3;
+ __muldf3;
+ __divsf3;
+ __divdf3;
+ __floatsisf;
+ __floatsidf;
+ __floatdisf;
+ __floatdidf;
+ __fixsfsi;
+ __fixdfsi;
+ __fixsfdi;
+ __fixdfdi;
+ __fixunssfsi;
+ __fixunsdfsi;
+ __extendsfdf2;
+ __truncdfsf2;
};
==== //depot/projects/wifi/lib/libc/gmon/Symbol.map#3 (text) ====
@@ -1,9 +1,8 @@
/*
- * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $
*/
FBSD_1.0 {
- .mcount;
_mcleanup;
monstartup;
moncontrol;
==== //depot/projects/wifi/lib/libc/i386/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.3 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.4 2007/05/13 14:16:55 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ .mcount;
_setjmp;
_longjmp;
alloca;
==== //depot/projects/wifi/lib/libc/net/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.8 2007/04/29 14:05:17 deischen Exp $
+ * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.9 2007/05/13 15:01:25 rwatson Exp $
*/
FBSD_1.0 {
@@ -7,7 +7,9 @@
__b64_pton;
ether_line;
ether_aton;
+ ether_aton_r;
ether_ntoa;
+ ether_ntoa_r;
ether_ntohost;
ether_hostton;
eui64_aton;
==== //depot/projects/wifi/lib/libc/net/ether_addr.c#2 (text+ko) ====
@@ -1,6 +1,7 @@
/*
- * Copyright (c) 1995
- * Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
+ * Copyright (c) 1995 Bill Paul <wpaul at ctr.columbia.edu>.
+ * Copyright (c) 2007 Robert N. M. Watson
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,103 +38,104 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $");
-#include <stdio.h>
-#include <paths.h>
#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
#include <sys/param.h>
#include <sys/socket.h>
+
#include <net/ethernet.h>
+
#ifdef YP
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
#endif
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
+#define _PATH_ETHERS "/etc/ethers"
#endif
/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
+ * Parse a string of text containing an ethernet address and hostname and
+ * separate it into its component parts.
*/
int
-ether_line(l, e, hostname)
- const char *l;
- struct ether_addr *e;
- char *hostname;
+ether_line(const char *l, struct ether_addr *e, char *hostname)
{
- int i, o[6];
+ int i, o[6];
- i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
- &o[3], &o[4], &o[5],
- hostname);
+ i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3],
+ &o[4], &o[5], hostname);
if (i != 7)
- return (i);
-
- for (i=0; i<6; i++)
- e->octet[i] = o[i];
- return (0);
+ return (i);
+ for (i=0; i<6; i++)
+ e->octet[i] = o[i];
+ return (0);
}
/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
+ * Convert an ASCII representation of an ethernet address to binary form.
*/
-struct
-ether_addr *ether_aton(a)
- const char *a;
+struct ether_addr *
+ether_aton_r(const char *a, struct ether_addr *e)
{
- int i;
- static struct ether_addr o;
+ int i;
unsigned int o0, o1, o2, o3, o4, o5;
- i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
+ i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
+ if (i != 6)
+ return (NULL);
+ e->octet[0]=o0;
+ e->octet[1]=o1;
+ e->octet[2]=o2;
+ e->octet[3]=o3;
+ e->octet[4]=o4;
+ e->octet[5]=o5;
+ return (e);
+}
- if (i != 6)
- return (NULL);
+struct ether_addr *
+ether_aton(const char *a)
+{
+ static struct ether_addr e;
- o.octet[0]=o0;
- o.octet[1]=o1;
- o.octet[2]=o2;
- o.octet[3]=o3;
- o.octet[4]=o4;
- o.octet[5]=o5;
-
- return ((struct ether_addr *)&o);
+ return (ether_aton_r(a, &e));
}
/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
+ * Convert a binary representation of an ethernet address to an ASCII string.
*/
-char
-*ether_ntoa(n)
- const struct ether_addr *n;
+char *
+ether_ntoa_r(const struct ether_addr *n, char *a)
+{
+ int i;
+
+ i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0],
+ n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]);
+ if (i < 17)
+ return (NULL);
+ return (a);
+}
+
+char *
+ether_ntoa(const struct ether_addr *n)
{
- int i;
static char a[18];
- i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
- n->octet[0], n->octet[1], n->octet[2],
- n->octet[3], n->octet[4], n->octet[5]);
- if (i < 17)
- return (NULL);
- return ((char *)&a);
+ return (ether_ntoa_r(n, a));
}
/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
+ * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP.
*/
int
-ether_ntohost(hostname, e)
- char *hostname;
- const struct ether_addr *e;
+ether_ntohost(char *hostname, const struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -145,9 +147,9 @@
char *ether_a;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -157,7 +159,7 @@
continue;
ether_a = ether_ntoa(e);
if (yp_match(yp_domain, "ethers.byaddr", ether_a,
- strlen(ether_a), &result, &resultlen)) {
+ strlen(ether_a), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -167,8 +169,8 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!bcmp((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6)) {
- /* We have a match */
+ (char *)&e->octet[0], 6)) {
+ /* We have a match. */
strcpy(hostname, local_host);
fclose(fp);
return(0);
@@ -180,13 +182,10 @@
}
/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
+ * Map a hostname to an ethernet address using /etc/ethers or NIS/YP.
*/
int
-ether_hostton(hostname, e)
- const char *hostname;
- struct ether_addr *e;
+ether_hostton(const char *hostname, struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -197,9 +196,9 @@
int resultlen;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -208,7 +207,7 @@
if (yp_get_default_domain(&yp_domain))
continue;
if (yp_match(yp_domain, "ethers.byname", hostname,
- strlen(hostname), &result, &resultlen)) {
+ strlen(hostname), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -218,9 +217,9 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!strcmp(hostname, local_host)) {
- /* We have a match */
+ /* We have a match. */
bcopy((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6);
+ (char *)&e->octet[0], 6);
fclose(fp);
return(0);
}
==== //depot/projects/wifi/lib/libc/net/ethers.3#3 (text+ko) ====
@@ -1,5 +1,6 @@
-.\" Copyright (c) 1995
-.\" Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
+.\" Copyright (c) 1995 Bill Paul <wpaul at ctr.columbia.edu>.
+.\" Copyright (c) 2007 Robert N. M. Watson
+.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -28,16 +29,18 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.23 2005/01/20 09:17:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $
.\"
-.Dd April 12, 1995
+.Dd May 13, 2007
.Dt ETHERS 3
.Os
.Sh NAME
.Nm ethers ,
.Nm ether_line ,
.Nm ether_aton ,
+.Nm ether_aton_r ,
.Nm ether_ntoa ,
+.Nm ether_ntoa_r ,
.Nm ether_ntohost ,
.Nm ether_hostton
.Nd Ethernet address conversion and lookup routines
@@ -51,8 +54,12 @@
.Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname"
.Ft struct ether_addr *
.Fn ether_aton "const char *a"
+.Ft struct ether_addr *
+.Fn ether_aton_r "const char *a" "struct ether_addr *e"
.Ft char *
.Fn ether_ntoa "const struct ether_addr *n"
+.Ft char *
+.Fn ether_ntoa_r "const struct ether_addr *n" "char *buf"
.Ft int
.Fn ether_ntohost "char *hostname" "const struct ether_addr *e"
.Ft int
@@ -95,18 +102,23 @@
.Pp
The
.Fn ether_aton
-function converts an
+and
+.Fn ether_aton_r
+functions convert
.Tn ASCII
-representation of an ethernet address into an
+representation of ethernet addresses into
.Vt ether_addr
-structure.
-Likewise,
+structures.
+Likewise, the
.Fn ether_ntoa
-converts an ethernet address specified as an
+and
+.Fn ether_ntoa_r
+functions
+convert ethernet addresses specified as
.Vt ether_addr
-structure into an
+structures into
.Tn ASCII
-string.
+strings.
.Pp
The
.Fn ether_ntohost
@@ -138,7 +150,9 @@
.Pp
On success,
.Fn ether_ntoa
-returns a pointer to a string containing an
+and
+.Fn ether_ntoa_r
+functions return a pointer to a string containing an
.Tn ASCII
representation of an ethernet address.
If it is unable to convert
@@ -147,13 +161,25 @@
structure, it returns a
.Dv NULL
pointer.
+.Fn ether_ntoa
+stores the result in a static buffer;
+.Fn ether_ntoa_r
+stores the result in a user-passed buffer.
+.Pp
+
Likewise,
.Fn ether_aton
-returns a pointer to an
+and
+.Fn ether_aton_r
+return a pointer to an
.Vt ether_addr
structure on success and a
.Dv NULL
pointer on failure.
+.Fn ether_aton
+stores the result in a static buffer;
+.Fn ether_aton_r
+stores the result in a user-passed buffer.
.Pp
The
.Fn ether_ntohost
@@ -192,6 +218,8 @@
.Nm
library functions were written for and first appeared in
.Fx 2.1 .
+Thread-safe function variants first appeared in
+.Fx 7.0 .
.Sh BUGS
The
.Fn ether_aton
@@ -199,3 +227,8 @@
.Fn ether_ntoa
functions returns values that are stored in static memory areas
which may be overwritten the next time they are called.
+.Pp
+.Fn ether_ntoa_r
+accepts a character buffer pointer, but not a buffer length.
+The caller must ensure adequate space is available in the buffer in order to
+avoid a buffer overflow.
==== //depot/projects/wifi/lib/libc/powerpc/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.2 2007/04/29 14:05:18 deischen Exp $
+ * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ _mcount;
_setjmp;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list