Date: Sat, 4 Jul 2009 12:48:35 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 165592 for review Message-ID: <200907041248.n64CmZNT074098@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165592 Change 165592 by trasz@trasz_victim on 2009/07/04 12:47:40 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#34 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libssp/libssp_nonshared/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/semctl.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/shmctl.2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/stack_protector.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/amd64/boot_crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/i386/boot_crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/ia64/boot_crunch.conf#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/pc98/boot_crunch.conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/powerpc/boot_crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-split.py#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/sparc64/boot_crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/sun4v/boot_crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#43 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/mwl/mw88W8363.fw.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_hp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_wmi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_wmi_if.m#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ale/if_ale.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_internal.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwlvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/mwlhal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/mwlhal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/mwlreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/ustorage_fs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_controller.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_if.m#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_lookup.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_io.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/msi.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_intr.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_process.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_socket.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#37 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/busdma_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/dump_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/intr_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsclient/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsserver/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_var.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs/nfs_common.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs/rpcv2.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/krpc_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_krpc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_socket.c#9 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfsm_subs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_fha.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvcache.c#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvkrpc.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#9 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_syscalls.c#10 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfsrvcache.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_dg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/conf/GENERIC#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cpuctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/filio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/tools/sound/feeder_rate_mkfilter.awk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_extern.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_fault.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cmdline.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cpio.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/url.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/doc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/menus.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/sysinstall.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tzsetup/tzsetup.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tzsetup/tzsetup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/wake.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/wake.c#1 branch Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.625 2009/06/14 15:16:24 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.627 2009/06/29 01:33:59 kan Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.198 2009/06/27 10:11:15 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.199 2009/07/01 07:37:21 dfr Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090630: old kernel RPC implementation removal +OLD_FILES+=usr/include/nfs/rpcv2.h # 20090624: update usbdi(9) OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#34 (text+ko) ==== @@ -22,6 +22,23 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090630: + The NFS_LEGACYRPC option has been removed along with the old + kernel RPC implementation that this option selected. Kernel + configurations may need to be adjusted. + +20090629: + The network interface device nodes at /dev/net/<interface> have + been removed. All ioctl operations can be performed the normal + way using routing sockets. The kqueue functionality can + generally be replaced with routing sockets. + +20090628: + The documentation from the FreeBSD Documentation Project + (Handbook, FAQ, etc.) is now installed via packages by + sysinstall(8) and under the /usr/local/share/doc/freebsd + directory instead of /usr/share/doc. + 20090624: The ABI of various structures related to the SYSV IPC API have been changed. As a result, the COMPAT_FREEBSD[456] kernel @@ -1624,4 +1641,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.623 2009/06/26 17:50:52 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.627 2009/07/01 18:12:50 dfr Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.34 2009/06/23 23:30:56 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.35 2009/07/01 15:52:19 trasz Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -186,8 +186,14 @@ * identical to the one computed from an ACL will change * that ACL. */ +>>>> ORIGINAL //depot/vendor/freebsd/src/bin/chmod/chmod.c#13 +==== THEIRS //depot/vendor/freebsd/src/bin/chmod/chmod.c#14 + if (may_have_nfs4acl(p) == 0 && + (newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) +==== YOURS //trasz_victim/nfs4acl/bin/chmod/chmod.c if (may_have_nfs4acl(p) == 0) { if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) +<<<< continue; } if ((*change_mode)(p->fts_accpath, newmode) && !fflag) { @@ -239,7 +245,12 @@ previous_dev = ent->fts_statp->st_dev; supports_acls = 0; +>>>> ORIGINAL //depot/vendor/freebsd/src/bin/chmod/chmod.c#13 +==== THEIRS //depot/vendor/freebsd/src/bin/chmod/chmod.c#14 + ret = pathconf(ent->fts_accpath, _PC_ACL_NFS4); +==== YOURS //trasz_victim/nfs4acl/bin/chmod/chmod.c ret = pathconf(ent->fts_accpath, _PC_EXTENDED_SECURITY_NP); +<<<< if (ret > 0) supports_acls = 1; else if (ret < 0 && errno != EINVAL) ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgcc/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.63 2009/02/13 16:51:36 jkim Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.65 2009/06/29 01:33:59 kan Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libssp/libssp_nonshared/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libssp/libssp_nonshared/Makefile,v 1.1 2007/05/19 04:25:56 kan Exp $ +# $FreeBSD: src/gnu/lib/libssp/libssp_nonshared/Makefile,v 1.3 2009/06/29 01:33:59 kan Exp $ GCCDIR= ${.CURDIR}/../../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.29 2007/10/12 17:49:12 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.31 2009/06/29 01:33:59 kan Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.75 2009/03/13 10:40:38 gabor Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.77 2009/06/29 01:33:59 kan Exp $ SHLIBDIR?= /lib ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/msgctl.3#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.21 2008/04/03 16:21:43 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.22 2009/06/29 18:54:17 kib Exp $ .\"/ .Dd April 3, 2008 .Dt MSGCTL 3 @@ -71,12 +71,8 @@ pid_t msg_lspid; /* pid of last msgsnd() */ pid_t msg_lrpid; /* pid of last msgrcv() */ time_t msg_stime; /* time of last msgsnd() */ - long msg_pad1; time_t msg_rtime; /* time of last msgrcv() */ - long msg_pad2; time_t msg_ctime; /* time of last msgctl() */ - long msg_pad3; - long msg_pad4[4]; }; .Ed .Pp @@ -89,11 +85,11 @@ and looks like this: .Bd -literal struct ipc_perm { - unsigned short cuid; /* creator user id */ - unsigned short cgid; /* creator group id */ - unsigned short uid; /* user id */ - unsigned short gid; /* group id */ - unsigned short mode; /* r/w permission */ + uid_t cuid; /* creator user id */ + gid_t cgid; /* creator group id */ + uid_t uid; /* user id */ + gid_t gid; /* group id */ + mode_t mode; /* r/w permission */ unsigned short seq; /* sequence # (to generate unique ipcid) */ key_t key; /* user specified msg/sem/shm key */ }; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#11 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.24 2009/06/24 21:10:52 jhb Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.26 2009/06/29 01:33:59 kan Exp $ */ /* ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/getsockopt.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.40 2008/06/12 22:58:35 wkoszek Exp $ +.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.41 2009/06/30 20:53:56 trasz Exp $ .\" .Dd June 13, 2008 .Dt GETSOCKOPT 2 @@ -139,6 +139,11 @@ .In sys/time.h . .Pp The following options are recognized at the socket level. +For protocol-specific options, see protocol manual pages, +e.g. +.Xr ip 4 +or +.Xr tcp 4 . Except as noted, each may be examined with .Fn getsockopt and set with @@ -499,6 +504,10 @@ .Xr getprotoent 3 , .Xr mac 3 , .Xr sysctl 3 , +.Xr ip 4 , +.Xr ip6 4 , +.Xr sctp 4 , +.Xr tcp 4 , .Xr protocols 5 , .Xr sysctl 8 , .Xr accept_filter 9 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/semctl.2#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/semctl.2,v 1.20 2005/01/15 12:28:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/semctl.2,v 1.21 2009/06/29 18:54:17 kib Exp $ .\" .Dd September 12, 1995 .Dt SEMCTL 2 @@ -148,12 +148,9 @@ struct sem *sem_base; /* pointer to first semaphore in set */ u_short sem_nsems; /* number of sems in set */ time_t sem_otime; /* last operation time */ - long sem_pad1; /* SVABI/386 says I need this here */ time_t sem_ctime; /* last change time */ /* Times measured in secs since */ /* 00:00:00 GMT, Jan. 1, 1970 */ - long sem_pad2; /* SVABI/386 says I need this here */ - long sem_pad3[4]; /* SVABI/386 says I need this here */ }; .Ed .Sh RETURN VALUES ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/shmctl.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/shmctl.2,v 1.20 2009/03/05 12:04:42 kib Exp $ +.\" $FreeBSD: src/lib/libc/sys/shmctl.2,v 1.21 2009/06/29 18:54:17 kib Exp $ .\" .Dd July 17, 1995 .Dt SHMCTL 2 @@ -100,14 +100,13 @@ .Bd -literal struct shmid_ds { struct ipc_perm shm_perm; /* operation permission structure */ - int shm_segsz; /* size of segment in bytes */ + size_t shm_segsz; /* size of segment in bytes */ pid_t shm_lpid; /* process ID of last shared memory op */ pid_t shm_cpid; /* process ID of creator */ - short shm_nattch; /* number of current attaches */ + int shm_nattch; /* number of current attaches */ time_t shm_atime; /* time of last shmat() */ time_t shm_dtime; /* time of last shmdt() */ time_t shm_ctime; /* time of last change by shmctl() */ - void *shm_internal; /* sysv stupidity */ }; .Ed .Sh RETURN VALUES @@ -133,16 +132,6 @@ Permission denied due to mismatch between operation and mode of shared memory segment. .El -.Sh "BUGS" -The segment size has size_t type. -The shm_segsz member of the -.Vt shmid_ds -structure has type int, which is too short to represent the full range -of values for a segment size. -If shared memory limits are raised to allow segments with size > 2 GB -to be created, be aware that IPC_STAT call may return a truncated value -for shm_segsz. -.El .Sh "SEE ALSO" .Xr shmat 2 , .Xr shmdt 2 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/stack_protector.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $ */ +/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.4 2009/06/29 01:33:59 kan Exp $ */ /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $ */ /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ /* @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.4 2009/06/29 01:33:59 kan Exp $"); #include <sys/param.h> #include <sys/sysctl.h> ==== //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.45 2009/06/29 01:33:59 kan Exp $ .include <bsd.own.mk> MK_SSP= no ==== //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.942 2009/06/25 04:25:26 marcel Exp $ +# $FreeBSD: src/release/Makefile,v 1.943 2009/06/28 08:59:46 blackend Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -39,6 +39,10 @@ # checking out from a local CVS repository, set this option. #EXTPORTSDIR=/usr/ports # +# To use a checked-out doc/ directory instead of +# checking out from a local CVS repository, set this option. +#EXTDOCDIR=/usr/doc +# # To add other options to the CVS subcommands (co,up), set #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'" # @@ -91,15 +95,13 @@ # the ports tree, so NOPORTS can be set together with NODOC in order # to have neither ports or docs. If only NOPORTS is set to YES, but # docs are still desired, the DOMINIMALDOCPORTS logic below will only -# install the ports that are minimally required for the docs. This is +# install the ports that are minimally required for the release note documentation. This is # intended as a compromise, less disk space is required than for using # the entire ports collection (and much less time due to the huge number # of directories it would create), but still quite a bit as well as some # CPU cycles (some of the programs are C++, and things like ghostscript # belong to the required ports nevertheless). # -# Setting this also disables building of release note documentation -# (RELNOTESng). #NODOC= YES #NOPORTS= YES @@ -141,11 +143,6 @@ # # Doing 'make index' in /usr/ports requires Perl. MAKEINDEXPORTS= lang/perl5.8 -# By default, documentation (Handbook, FAQ, etc.) is built for all -# the languages. To speed up building, set the DOC_LANG to just -# the languages you need. (The language for the release notes is -# controlled by the RELNOTES_LANG variable above.) -#DOC_LANG= en_US.ISO8859-1 DOCPORTS= textproc/docproj # Set this to wherever the distfiles required by release procedures. .if defined(DOCDISTFILES) @@ -348,7 +345,7 @@ @echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false .endif .if defined(NOPORTSATALL) && !defined(NODOC) - @echo "Ports are required for building the docs. Either set NODOC or" + @echo "Ports are required for building the release docs. Either set NODOC or" @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif @@ -477,7 +474,6 @@ BUILDNAME \ CD_PACKAGE_TREE \ DISTRIBUTIONS \ - DOC_LANG \ DOMINIMALDOCPORTS \ EXTRA_SRC \ FTP_PASSIVE_MODE \ @@ -1037,22 +1033,8 @@ @echo "Building CDROM docs filesystem image" @mkdir -p ${CD_DOCS} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf - @mkdir -p ${CD_DOCS}/usr/share/doc -.if defined(MAKE_DVD) - @mkdir -p ${CD_DVD1}/usr/share/doc + @echo "CD_VOLUME = 3" >> ${CD_DOCS}/cdrom.inf .endif - @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ - if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ - -d /usr/doc/$$i ]; then \ - mv ${CD_LIVEFS}/usr/share/doc/$$i \ - ${CD_DOCS}/usr/share/doc; \ - fi \ - done -.if defined(MAKE_DVD) - @cd ${CD_DOCS}/usr/share/doc && find . -print | \ - cpio -dumpl ${CD_DVD1}/usr/share/doc -.endif -.endif touch ${.TARGET} # @@ -1082,6 +1064,11 @@ .if exists(${CD_PACKAGE_TREE}/disc2) CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 .endif +# scripts/package-trees.sh names all discs according to the "discX" +# scheme where X is the number of the disc +.if exists(${CD_PACKAGE_TREE}/disc3) +CD_DOCS_PKGS= ${CD_PACKAGE_TREE}/disc3 +.endif .if exists(${CD_PACKAGE_TREE}/dvd1) CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1 .endif @@ -1113,7 +1100,8 @@ .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Documentation \ - ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS} + ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ + ${CD_DOCS_PKGS} .endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ @@ -1139,9 +1127,6 @@ make all install clean BATCH=yes WITHOUT_X11=yes JADETEX=no \ WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ done - @cd /usr/doc && make all install 'FORMATS=html html-split txt' \ - INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc \ - URLS_ABSOLUTE=YES touch ${.TARGET} # ==== //depot/projects/soc2008/trasz_nfs4acl/release/amd64/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.66 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.67 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -42,4 +42,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb +libs -lbsdxml -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/i386/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.66 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.67 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -42,4 +42,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb +libs -lbsdxml -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/ia64/boot_crunch.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.17 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.18 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -46,4 +46,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo -libs -lgeom -lbsdxml -larchive -lbz2 -lusb +libs -lgeom -lbsdxml -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/pc98/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.65 2008/08/20 13:35:39 kensmith Exp $ +# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.66 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -41,4 +41,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 +libs -larchive -lbz2 -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/powerpc/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.9 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.10 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -44,4 +44,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -libs -lbsdxml -larchive -lbz2 -lusb +libs -lbsdxml -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-split.py#2 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py <INDEX> <master INDEX> # -# $FreeBSD: src/release/scripts/package-split.py,v 1.17 2007/11/07 09:11:45 kris Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.18 2009/06/28 08:59:46 blackend Exp $ import os import sys @@ -86,11 +86,34 @@ 'ports-mgmt/portaudit']) return pkgs +def docs_packages(): + pkgs = ['misc/freebsd-doc-bn', + 'misc/freebsd-doc-da', + 'misc/freebsd-doc-de', + 'misc/freebsd-doc-el', + 'misc/freebsd-doc-en', + 'misc/freebsd-doc-es', + 'misc/freebsd-doc-fr', + 'misc/freebsd-doc-hu', + 'misc/freebsd-doc-it', + 'misc/freebsd-doc-ja', + 'misc/freebsd-doc-mn', + 'misc/freebsd-doc-nl', + 'misc/freebsd-doc-pl', + 'misc/freebsd-doc-pt', + 'misc/freebsd-doc-ru', + 'misc/freebsd-doc-sr', + 'misc/freebsd-doc-tr', + 'misc/freebsd-doc-zh_cn', + 'misc/freebsd-doc-zh_tw'] + return pkgs + # The list of desired packages def desired_packages(): disc1 = disc1_packages() disc2 = disc2_packages() - return [disc1, disc2] + docs = docs_packages() + return [disc1, disc2, docs] # Suck the entire INDEX file into a two different dictionaries. The first # dictionary maps port names (origins) to package names. The second ==== //depot/projects/soc2008/trasz_nfs4acl/release/sparc64/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.13 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.14 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -42,4 +42,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb +libs -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/release/sun4v/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.6 2009/03/09 17:05:31 thompsa Exp $ +# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.7 2009/06/29 13:59:30 jamie Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -42,4 +42,4 @@ libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb +libs -larchive -lbz2 -lusb -ljail ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_hp.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.2 2009/06/23 14:57:06 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.4 2009/07/03 21:12:37 rpaulo Exp $ .\" -.Dd June 21, 2009 +.Dd June 30, 2009 .Dt ACPI_HP 4 i386 .Os .Sh NAME @@ -92,8 +92,8 @@ WWAN on air status changed to 1 (on air) .El .Ss Xr devfs 8 Ss Device -You can read /dev/hpcmi to see your current BIOS settings. The detail level -can be adjusted by setting the sysctl +You can read /dev/hpcmi to see your current BIOS settings. +The detail level can be adjusted by setting the sysctl .Va cmi_detail as described below. .Sh SYSCTL VARIABLES @@ -165,11 +165,30 @@ Show a list of valid options for the BIOS setting .It Li 0x04 Show additional flags of BIOS setting (ReadOnly etc.) +.It Li 0x08 +Query highest BIOS entry instance. +This is broken on many HP models and therefore disabled by default. .El +.It Va dev.acpi_hp.0.verbose +(read-only) +Set verbosity level .El .Pp Defaults for these sysctls can be set in .Xr sysctl.conf 5 . +.Sh HARDWARE +The +.Nm +driver has been reported to support the following hardware: +.Pp +.Bl -bullet -compact +.It +HP Compaq 8510p +.It +HP Compaq nx7300 +.El +.Pp +It should work on most HP laptops that feature a WMI enabled BIOS. .Sh FILES .Bl -tag -width ".Pa /dev/hpcmi" .It Pa /dev/hpcmi @@ -245,7 +264,7 @@ driver was written by .An Michael Gmelin Aq freebsd@grem.de .Pp -It has been inspired by hp-wmi driver, which implements a subset of these +It has been inspired by hp-wmi driver, which implements a subset of these features (hotkeys) on Linux. .Pp .Bl -tag -width indent ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_wmi.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.2 2009/06/23 14:57:06 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.3 2009/07/03 21:12:37 rpaulo Exp $ .\" -.Dd June 21, 2009 +.Dd June 30, 2009 .Dt ACPI_WMI 4 i386 .Os .Sh NAME @@ -48,7 +48,8 @@ The .Nm driver provides an interface for vendor specific WMI implementations -(e.g. HP and Acer laptops). It creates /dev/wmistat, which can be read to get +(e.g. HP and Acer laptops). +It creates /dev/wmistat, which can be read to get information about GUIDs found in the system. .Sh FILES .Bl -tag -width /dev/wmistat -compact ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.6 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.7 2009/06/30 12:35:47 stas Exp $ .\" -.Dd May 31, 2008 +.Dd June 30, 2009 .Dt CPUCTL 4 .Os .Sh NAME @@ -81,6 +81,11 @@ uint64_t data; } cpuctl_msr_args_t; .Ed +.It Dv CPUCTL_MSRSBIT Fa cpuctl_msr_args_t *args +.It Dv CPUCTL_MSRCBIT Fa cpuctl_msr_args_t *args +Set/clear MSR bits according to the mask given in the +.Va data +field. .It Dv CPUCTL_CPUID Fa cpuctl_cpuid_args_t *args Retrieve CPUID information. Arguments are supplied in ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/genassym.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.175 2009/04/01 18:36:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.176 2009/07/01 07:34:28 dfr Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -64,7 +64,6 @@ #include <net/if.h> #include <netinet/in.h> #include <nfs/nfsproto.h> -#include <nfs/rpcv2.h> #include <nfsclient/nfs.h> #include <nfsclient/nfsdiskless.h> #include <machine/apicreg.h> ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); #include "opt_cpu.h" @@ -107,9 +107,6 @@ }; -extern int pq_l2size; -extern int pq_l2nways; - void printcpuinfo(void) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.44 2009/06/25 20:35:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.45 2009/07/01 17:20:07 jhb Exp $ */ /* @@ -163,8 +163,8 @@ } int -intr_add_handler(const char *name, int vector, driver_filter_t filter, - driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -302,7 +302,8 @@ intr_assign_cpu(void *arg, u_char cpu) { #ifdef SMP - struct intsrc *isrc; + struct intsrc *isrc; + int error; /* * Don't do anything during early boot. We will pick up the @@ -311,10 +312,11 @@ if (assign_cpu && cpu != NOCPU) { isrc = arg; mtx_lock(&intr_table_lock); - isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907041248.n64CmZNT074098>