PERFORCE change 144869 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Jul 8 10:06:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144869
Change 144869 by trasz at trasz_traszkan on 2008/07/08 10:05:57
IFC
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/expand_number.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bpf.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/k8temp/k8temp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/ia64_cpu.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_malloc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/adm5120reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/admpci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/console.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/files.adm5120#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admsw.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admswreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admswvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obio.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obiovar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/std.adm5120#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/files.idt#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idt_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtpci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_kr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_krreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obio.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obiovar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/std.idt#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/files.malta#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt_pci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gtreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gtvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/malta_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/maltareg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/obio.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/obiovar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/std.malta#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/adm5120reg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/admpci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/console.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/files.adm5120#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admsw.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admswreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/if_admswvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/obio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/obiovar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/std.adm5120#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/files.idt#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idt_machdep.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idtpci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/idtreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/if_kr.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/if_krreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/obio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/obiovar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/std.idt#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/files.malta#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gt.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gt_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gtreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/gtvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/malta_machdep.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/maltareg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/obio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/obiovar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/std.malta#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/yamon.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/malta/yamon.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/files.sentry5#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/obio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/obiovar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/s5_machdep.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/s5reg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_cc.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_mips.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/siba_sdram.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/files.sentry5#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/obio.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/obiovar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5_machdep.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_cc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_mips.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/siba_sdram.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_kern.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cpio.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/create/main.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#3 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.150 2008/07/04 21:24:35 jhb Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel 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,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080706: bsdlabel(8) removed on powerpc
+.if ${TARGET_ARCH} == "powerpc"
+OLD_FILES+=sbin/bsdlabel
+OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
+.endif
# 20080704: sbsh(4) removed
OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
OLD_FILES+=usr/share/man/man4/sbsh.4.gz
==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#3 (text+ko) ====
@@ -413,6 +413,20 @@
This does not affect those who are using "/dev/dsp".
20061122:
+ geom(4)'s gmirror(8) class metadata structure has been
+ rev'd from v3 to v4. If you update across this point and
+ your metadata is converted for you, you will not be easily
+ able to downgrade since the /boot/kernel.old/geom_mirror.ko
+ kernel module will be unable to read the v4 metadata. You
+ can resolve this by doing from the loader(8) prompt:
+
+ set vfs.root.mountfrom="ufs:/dev/XXX"
+
+ where XXX is the root slice of one of the disks that composed
+ the mirror (i.e.: /dev/ad0s1a). You can then rebuild
+ the array the same way you built it originally.
+
+20061122:
The following binaries have been disconnected from the build:
mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs,
and mount_std. The functionality of these programs has been
@@ -1053,4 +1067,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $
+$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $
==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $
.\"
.Dd January 7, 2001
.Dt SETFACL 1
@@ -234,9 +234,27 @@
.Pp
Multiple ACL entries specified on the command line are
separated by commas.
+.Pp
+It is possible for files and directories to inherit ACL entries from their
+parent directory.
+This is accomplished through the use of the default ACL.
+It should be noted that before you can specify a default ACL, the mandatory
+ACL entries for user, group, other and mask must be set.
+For more details see the examples below.
+Default ACLs can be created by using
+.Fl d .
.Sh EXIT STATUS
.Ex -std
.Sh EXAMPLES
+.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir
+.Dl setfacl -d -m g:admins:rwx dir
+.Pp
+The first command sets the mandatory elements of the default ACL.
+The second command specifies that users in group admins can have read, write, and execute
+permissions for directory named "dir".
+It should be noted that any files or directories created underneath "dir" will
+inherit these default ACLs upon creation.
+.Pp
.Dl setfacl -m u::rwx,g:mail:rw file
.Pp
Sets read, write, and execute permissions for the
==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $
+# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $
#
# PROVIDE: savecore
@@ -17,11 +17,6 @@
savecore_prestart()
{
- # ${DUMPDIR} should be a directory or a symbolic link
- # to the crash directory if core dumps are to be saved.
- #
- DUMPDIR="${dumpdir:-/var/crash}"
-
# Quit if we have no dump device
case ${dumpdev} in
[Nn][Oo] | '')
@@ -57,8 +52,19 @@
savecore_start()
{
- if savecore -C >/dev/null; then
- savecore ${savecore_flags} ${DUMPDIR} ${dumpdev}
+ local dev
+
+ case "${dumpdev}" in
+ [Aa][Uu][Tt][Oo])
+ dev=
+ ;;
+ *)
+ dev="${dumpdev}"
+ ;;
+ esac
+
+ if savecore -C "${dumpdir}" "${dev}" >/dev/null; then
+ savecore ${savecore_flags} ${dumpdir} ${dumpdev}
else
[ -z "${rc_quiet}" ] && echo "No core dumps found"
fi
==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#4 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.266 2008/07/05 08:54:58 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.267 2008/07/07 10:04:16 phk Exp $
%
=======================================================================
|| ||
@@ -52177,7 +52177,7 @@
the affair," and of course be sadly disappointed thereby.
-- Sacramento Daily Union, November 29, 1861
%
-Too many of his [Mozarts] works sound like interoffice memos.
+Too many of his [Mozart's] works sound like interoffice memos.
-- Glenn Gould
%
Too many people are thinking of security instead of opportunity.
==== //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#3 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.89 2008/06/23 05:22:06 ed Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $
*/
#ifndef _UNISTD_H_
@@ -107,7 +107,7 @@
#define _POSIX_READER_WRITER_LOCKS 200112L
#define _POSIX_REGEXP 1
#define _POSIX_SHELL 1
-#define _POSIX_SPAWN -1
+#define _POSIX_SPAWN 200112L
#define _POSIX_SPIN_LOCKS 200112L
#define _POSIX_THREAD_ATTR_STACKADDR 200112L
#define _POSIX_THREAD_ATTR_STACKSIZE 200112L
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.3#2 (text+ko) ====
@@ -1,6 +1,34 @@
-.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.5 2005/01/20 09:17:04 ru Exp $
+.\"-
+.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Klaus Klein.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (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/stdlib/hcreate.3,v 1.7 2008/07/06 17:03:37 danger Exp $
.\"
-.Dd May 8, 2001
+.Dd July 6, 2008
.Os
.Dt HCREATE 3
.Sh NAME
@@ -111,8 +139,10 @@
.Sh RETURN VALUES
The
.Fn hcreate
-function returns 0 if it cannot allocate sufficient space for the table;
-otherwise, it returns non-zero.
+function returns 0 if the table creation failed and the global variable
+.Va errno
+is set to indicate the error;
+otherwise, a non-zero value is returned.
.Pp
The
.Fn hdestroy
@@ -199,6 +229,8 @@
.Bl -tag -width Er
.It Bq Er ENOMEM
Insufficient storage space is available.
+.It Bq Er EINVAL
+A table already exists.
.El
.Sh SEE ALSO
.Xr bsearch 3 ,
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/hcreate.c#2 (text+ko) ====
@@ -52,7 +52,7 @@
__RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.4 2008/07/06 11:31:20 danger Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -93,7 +93,7 @@
size_t idx;
unsigned int p2;
- /* Make sure this this isn't called when a table already exists. */
+ /* Make sure this is not called when a table already exists. */
if (htable != NULL) {
errno = EINVAL;
return 0;
@@ -103,11 +103,11 @@
if (nel < MIN_BUCKETS)
nel = MIN_BUCKETS;
- /* If it's too large, cap it. */
+ /* If it is too large, cap it. */
if (nel > MAX_BUCKETS)
nel = MAX_BUCKETS;
- /* If it's is not a power of two in size, round up. */
+ /* If it is not a power of two in size, round up. */
if ((nel & (nel - 1)) != 0) {
for (p2 = 0; nel != 0; p2++)
nel >>= 1;
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/expand_number.c#2 (text+ko) ====
@@ -26,11 +26,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/expand_number.c,v 1.3 2007/11/18 02:20:02 jb Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/expand_number.c,v 1.4 2008/07/07 12:20:34 kib Exp $");
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
+#include <inttypes.h>
#include <libutil.h>
#include <stdint.h>
==== //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.932 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.933 2008/07/07 16:23:04 marcel Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -128,7 +128,7 @@
.if defined(NOPORTS) && !defined(NODOC)
DOMINIMALDOCPORTS= YES
.include "Makefile.inc.docports"
-RELEASEPORTSMODULE= ${MINIMALDOCPORTS}
+RELEASEPORTSMODULE= ${MINIMALDOCPORTS} ports/sysutils/cdrtools
.endif
# Helper variable
==== //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.332 2008/07/06 10:57:58 danger Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -724,13 +724,6 @@
</sect2>
- <sect2 id="tokenring">
- <title>Token Ring Interfaces</title>
-
- &hwlist.oltr;
-
- </sect2>
-
<sect2 id="fddi">
<title>FDDI Interfaces</title>
<para>[&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; driver)</para>
@@ -764,8 +757,6 @@
&hwlist.ath;
- &hwlist.cnw;
-
<para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network
adapter (&man.ipw.4; driver)</para>
@@ -809,13 +800,6 @@
&hwlist.ctau;
- <para>[&arch.i386;] Granch SBNI12 point-to-point communications
- adapters (&man.sbni.4; driver)
- </para>
-
- <para>[&arch.i386;] Granch SBNI16 SHDSL modems (&man.sbsh.4;
- driver)</para>
-
&hwlist.cm;
</sect2>
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.172 2008/07/04 04:33:33 marcel Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.173 2008/07/06 20:57:35 marcel Exp $
.include <bsd.own.mk>
@@ -113,7 +113,7 @@
_rtsol= rtsol
.endif
-.if ${MACHINE_ARCH} != "ia64"
+.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc"
_bsdlabel= bsdlabel
.endif
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bpf.4#2 (text+ko) ====
@@ -47,7 +47,7 @@
.\" This document is derived in part from the enet man page (enet.4)
.\" distributed with 4.3BSD Unix.
.\"
-.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $
+.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.51 2008/07/07 09:27:02 dwmalone Exp $
.\"
.Dd February 26, 2007
.Dt BPF 4
@@ -403,6 +403,7 @@
which must respond to messages in real time.
The default for a new file is off.
.It Dv BIOCSETF
+.It Dv BIOCSETFNR
.Pq Li "struct bpf_program"
Sets the read filter program used by the kernel to discard uninteresting
packets.
@@ -422,12 +423,20 @@
is given by the
.Li bf_len
field.
-Also, the actions of
-.Dv BIOCFLUSH
-are performed.
See section
.Sx "FILTER MACHINE"
for an explanation of the filter language.
+The only difference between
+.Dv BIOCSETF
+and
+.Dv BIOCSETFNR
+is
+.Dv BIOCSETF
+performs the actions of
+.Dv BIOCFLUSH
+while
+.Dv BIOCSETFNR
+does not.
.It Dv BIOCSETWF
.Pq Li "struct bpf_program"
Sets the write filter program used by the kernel to control what type of
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#3 (text+ko) ====
@@ -58,9 +58,9 @@
.\" Created.
.\" [90/08/30 dbg]
.\"
-.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.53 2008/06/08 21:08:20 wkoszek Exp $
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.54 2008/07/07 21:32:02 bz Exp $
.\"
-.Dd June 8, 2008
+.Dd July 7, 2008
.Dt DDB 4
.Os
.Sh NAME
@@ -584,6 +584,13 @@
Show brief information about the TTY subsystem.
.\"
.Pp
+.It Ic show Cm cpusets
+Print numbered root and assigned CPU affinity sets.
+See
+.Xr cpuset 2
+for more details.
+.\"
+.Pp
.It Ic show Cm cyrixreg
Show registers specific to the Cyrix processor.
.\"
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ed.4,v 1.57 2008/01/29 00:13:20 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.58 2008/07/06 06:24:02 imp Exp $
.\"
.Dd January 27, 2008
.Dt ED 4
@@ -171,7 +171,7 @@
.It
Corega Ether98-T (flags 0x000000) (PC-98)
.It
-Corega Ether PCC-T/EtherII PCC-T/FEther PCC-TXF/PCC-TXD
+Corega Ether PCC-T/EtherII PCC-T/FEther PCC-TXF/PCC-TXD PCC-T/Fether II TXD
.It
Corega LAPCCTXD (TC5299J)
.It
@@ -283,7 +283,7 @@
.It
SMC WD8003E/WD8003EBT/WD8003S/WD8003SBT/WD8003W/WD8013EBT/WD8013W and clones
.It
-SMC EZCard PC Card, 8040-TX, 8041-TX, 8041-TX V.2
+SMC EZCard PC Card, 8040-TX, 8041-TX (AX88x90), 8041-TX V.2 (TC5299J)
.It
Socket LP-E, ES-1000 Ethernet/Serial, LP-E CF, LP-FE CF
.It
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGES.
.\"
-.\" $FreeBSD: src/share/man/man4/malo.4,v 1.4 2008/05/10 06:46:58 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/malo.4,v 1.6 2008/07/08 04:15:07 weongyo Exp $
.\"/
.Dd April 13, 2008
.Dt MALO 4
@@ -61,8 +61,7 @@
and Cardbus network adapters.
.Nm
supports
-.Cm station ,
-.Cm adhoc ,
+.Cm station
and
.Cm monitor
mode operation.
@@ -95,29 +94,22 @@
Join an existing BSS network (i.e., connect to an access point):
.Pp
.Bd -literal -offset indent
-ifconfig wlan create wlandev iwn0 inet 192.168.0.20 \e
+ifconfig wlan create wlandev malo0 inet 192.168.0.20 \e
netmask 0xffffff00
.Ed
.Pp
Join a specific BSS network with network name
.Dq Li my_net :
.Pp
-.Dl "ifconfig wlan create wlandev iwn0 ssid my_net up"
+.Dl "ifconfig wlan create wlandev malo0 ssid my_net up"
.Pp
Join a specific BSS network with 64-bit WEP encryption:
.Bd -literal -offset indent
-ifconfig wlan create wlandev iwn0 ssid my_net \e
+ifconfig wlan create wlandev malo0 ssid my_net \e
wepmode on wepkey 0x1234567890 weptxkey 1 up
.Ed
-.Pp
-Join a specific BSS network with 128-bit WEP encryption:
-.Bd -literal -offset indent
-ifconfig wlan create wlandev iwn0 wlanmode adhoc ssid my_net \e
- wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
-.Ed
.Sh SEE ALSO
.Xr cardbus 4 ,
-.Xr malofw 4 ,
.Xr pci 4 ,
.Xr wlan 4 ,
.Xr wlan_ccmp 4 ,
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#3 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.5 2008/06/20 20:59:31 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -206,7 +206,8 @@
/* Walk page table pages, set bits in vm_page_dump */
ptesize = 0;
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
+ for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR,
+ kernel_vm_end); va += NBPDR) {
i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
/*
* We always write a page, even if it is zero. Each
@@ -312,7 +313,8 @@
/* Dump kernel page table pages */
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
+ for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR,
+ kernel_vm_end); va += NBPDR) {
i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
/* We always write a page, even if it is zero */
if ((pdp[i] & PG_V) == 0) {
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#5 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.624 2008/07/02 05:41:23 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.626 2008/07/07 17:25:09 alc Exp $");
/*
* Manages physical address maps.
@@ -440,16 +440,16 @@
/* Read-only from zero to physfree */
/* XXX not fully used, underneath 2M pages */
for (i = 0; (i << PAGE_SHIFT) < *firstaddr; i++) {
- ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) /
- PAGE_SIZE + i] = i << PAGE_SHIFT;
- ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) /
- PAGE_SIZE + i] |= PG_RW | PG_V | PG_G;
+ ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT;
+ ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V | PG_G;
}
/* Now map the page tables at their location within PTmap */
for (i = 0; i < NKPT; i++) {
- ((pd_entry_t *)KPDphys)[i] = KPTphys + (i << PAGE_SHIFT);
- ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V;
+ ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) /
+ NBPDR + i] = KPTphys + (i << PAGE_SHIFT);
+ ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) /
+ NBPDR + i] |= PG_RW | PG_V;
}
/* Map from zero to end of allocations under 2M pages */
@@ -647,15 +647,17 @@
* Initialize the vm page array entries for the kernel pmap's
* page table pages.
*/
- pd = pmap_pde(kernel_pmap, VM_MIN_KERNEL_ADDRESS);
+ pd = pmap_pde(kernel_pmap, KERNBASE);
for (i = 0; i < NKPT; i++) {
if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V))
continue;
+ KASSERT((pd[i] & PG_V) != 0,
+ ("pmap_init: page table page is missing"));
mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME);
KASSERT(mpte >= vm_page_array &&
mpte < &vm_page_array[vm_page_array_size],
("pmap_init: page table page is out of range"));
- mpte->pindex = pmap_pde_pindex(VM_MIN_KERNEL_ADDRESS) + i;
+ mpte->pindex = pmap_pde_pindex(KERNBASE) + i;
mpte->phys_addr = pd[i] & PG_FRAME;
}
@@ -1722,10 +1724,12 @@
if (pde == NULL) {
/* We need a new PDP entry */
nkpg = vm_page_alloc(NULL, kernel_vm_end >> PDPSHIFT,
- VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
+ VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ |
+ VM_ALLOC_WIRED | VM_ALLOC_ZERO);
if (nkpg == NULL)
panic("pmap_growkernel: no memory to grow kernel");
- pmap_zero_page(nkpg);
+ if ((nkpg->flags & PG_ZERO) == 0)
+ pmap_zero_page(nkpg);
paddr = VM_PAGE_TO_PHYS(nkpg);
newpdp = (pdp_entry_t)
(paddr | PG_V | PG_RW | PG_A | PG_M);
@@ -1742,10 +1746,12 @@
}
nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end),
- VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
+ VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED |
+ VM_ALLOC_ZERO);
if (nkpg == NULL)
panic("pmap_growkernel: no memory to grow kernel");
- pmap_zero_page(nkpg);
+ if ((nkpg->flags & PG_ZERO) == 0)
+ pmap_zero_page(nkpg);
paddr = VM_PAGE_TO_PHYS(nkpg);
newpdir = (pd_entry_t) (paddr | PG_V | PG_RW | PG_A | PG_M);
*pmap_pde(kernel_pmap, kernel_vm_end) = newpdir;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#4 (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.502 2008/06/20 19:28:33 delphij Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.503 2008/07/07 22:55:11 delphij Exp $
cpu HAMMER
ident GENERIC
@@ -64,6 +64,7 @@
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options STOP_NMI # Stop CPUS using NMI instead of IPI
options AUDIT # Security event auditing
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
# Debugging for use in -current
options KDB # Enable kernel debugger support.
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmap.h#3 (text+ko) ====
@@ -39,7 +39,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.143 2008/06/30 02:35:55 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.145 2008/07/06 22:36:28 alc Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -111,11 +111,11 @@
/* Initial number of kernel page tables. */
#ifndef NKPT
-#define NKPT 2288
+#define NKPT 32
#endif
#define NKPML4E 1 /* number of kernel PML4 slots */
-#define NKPDPE howmany(NKPT, NPDEPG)/* number of kernel PDP slots */
+#define NKPDPE 6 /* number of kernel PDP slots */
#define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */
#define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */
@@ -131,7 +131,7 @@
#define KPML4I (NPML4EPG-1) /* Top 512GB for KVM */
#define DMPML4I (KPML4I-1) /* Next 512GB down for direct map */
-#define KPDPI (NPDPEPG-6) /* kernel map starts at -6GB */
+#define KPDPI (NPDPEPG-7) /* kernel map starts at -7GB */
/*
* XXX doesn't really belong here I guess...
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#5 (text+ko) ====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.54 2008/07/03 04:53:14 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.55 2008/07/05 20:44:55 alc Exp $
*/
@@ -154,8 +154,8 @@
* 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot)
* 0xffff804020101000 - 0xfffffeffffffffff unused
* 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings
- * 0xffffff8000000000 - 0xfffffffe7fffffff unused (506GB)
- * 0xfffffffe80000000 - 0xffffffffffffffff 6GB kernel map
+ * 0xffffff8000000000 - 0xfffffffe3fffffff unused (505GB)
+ * 0xfffffffe40000000 - 0xffffffffffffffff 7GB kernel map
*
* Within the kernel map:
*
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.113 2007/07/11 04:14:40 imp Exp $
+ * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.114 2008/07/06 06:19:19 imp Exp $
*/
/*
@@ -157,6 +157,8 @@
{ PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX},
{ PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90},
{ PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX},
+ { PCMCIA_CARD(COREGA, FETHER_II_PCC_TXD), NE2000DVF_AX88X90},
+ { PCMCIA_CARD(COREGA, LAPCCTXD), 0},
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
{ PCMCIA_CARD(DLINK, DE650), 0 },
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/k8temp/k8temp.c#2 (text) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.4 2008/05/14 09:57:21 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/k8temp/k8temp.c,v 1.7 2008/07/06 16:18:58 rpaulo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -54,6 +54,7 @@
int sc_ntemps;
struct sysctl_oid *sc_oid;
struct sysctl_oid *sc_sysctl_cpu[2];
+ struct intr_config_hook sc_ich;
};
#define VENDORID_AMD 0x1022
@@ -91,6 +92,7 @@
static void k8temp_identify(driver_t *driver, device_t parent);
static int k8temp_probe(device_t dev);
static int k8temp_attach(device_t dev);
+static void k8temp_intrhook(void *arg);
static int k8temp_detach(device_t dev);
static int k8temp_match(device_t dev);
static int32_t k8temp_gettemp(device_t dev, k8sensor_t sensor);
@@ -173,32 +175,20 @@
static int
k8temp_attach(device_t dev)
{
- device_t nexus, acpi, cpu;
struct k8temp_softc *sc = device_get_softc(dev);
- int i;
struct sysctl_ctx_list *sysctlctx;
struct sysctl_oid *sysctlnode;
+
/*
- * dev.cpu.N.temperature.
+ * Setup intrhook function to create dev.cpu sysctl entries. This is
+ * needed because the cpu driver may be loaded late on boot, after
+ * us.
*/
- nexus = device_find_child(root_bus, "nexus", 0);
- acpi = device_find_child(nexus, "acpi", 0);
-
- for (i = 0; i < 2; i++) {
- cpu = device_find_child(acpi, "cpu",
- device_get_unit(dev) * 2 + i);
- if (cpu) {
- sysctlctx = device_get_sysctl_ctx(cpu);
-
- sc->sc_sysctl_cpu[i] = SYSCTL_ADD_PROC(sysctlctx,
- SYSCTL_CHILDREN(device_get_sysctl_tree(cpu)),
- OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD,
- dev, CORE0, k8temp_sysctl, "I",
- "Max of sensor 0 / 1");
- }
- }
-
+ sc->sc_ich.ich_func = k8temp_intrhook;
+ sc->sc_ich.ich_arg = dev;
+ config_intrhook_establish(&sc->sc_ich);
+
/*
* dev.k8temp.N tree.
*/
@@ -238,6 +228,39 @@
return (0);
}
+void
+k8temp_intrhook(void *arg)
+{
+ int i;
+ device_t nexus, acpi, cpu;
+ device_t dev = (device_t) arg;
+ struct k8temp_softc *sc;
+ struct sysctl_ctx_list *sysctlctx;
+
+ sc = device_get_softc(dev);
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list