From owner-p4-projects@FreeBSD.ORG  Thu Sep 23 21:22:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 498CB16A4D0; Thu, 23 Sep 2004 21:22:17 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2388316A4CE
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 21:22:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EEA8543D3F
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 21:22:16 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8NLMGbE066292
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 21:22:16 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8NLMGsQ066289
	for perforce@freebsd.org; Thu, 23 Sep 2004 21:22:16 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 23 Sep 2004 21:22:16 GMT
Message-Id: <200409232122.i8NLMGsQ066289@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 62054 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Sep 2004 21:22:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=62054

Change 62054 by marcel@marcel_nfs on 2004/09/23 21:22:01

	IFC @62053

Affected files ...

.. //depot/projects/ia64/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/ia64/contrib/bind9/KNOWN_DEFECTS#1 branch
.. //depot/projects/ia64/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/ia64/contrib/bind9/bin/named/include/named/control.h#2 integrate
.. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.c#2 integrate
.. //depot/projects/ia64/contrib/bind9/version#2 integrate
.. //depot/projects/ia64/etc/defaults/periodic.conf#13 integrate
.. //depot/projects/ia64/etc/mtree/BSD.root.dist#14 integrate
.. //depot/projects/ia64/etc/periodic/security/security.functions#4 integrate
.. //depot/projects/ia64/lib/bind/config.mk#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#144 integrate
.. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 integrate
.. //depot/projects/ia64/sbin/reboot/boot_i386.8#11 integrate
.. //depot/projects/ia64/share/examples/diskless/clone_root#2 integrate
.. //depot/projects/ia64/share/man/man5/periodic.conf.5#14 integrate
.. //depot/projects/ia64/share/mk/bsd.libnames.mk#25 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#11 integrate
.. //depot/projects/ia64/sys/boot/efi/loader/main.c#20 integrate
.. //depot/projects/ia64/sys/coda/coda_vfsops.c#14 integrate
.. //depot/projects/ia64/sys/conf/NOTES#81 integrate
.. //depot/projects/ia64/sys/conf/files#118 integrate
.. //depot/projects/ia64/sys/conf/kern.post.mk#46 integrate
.. //depot/projects/ia64/sys/conf/options#78 integrate
.. //depot/projects/ia64/sys/contrib/pf/net/pfvar.h#4 integrate
.. //depot/projects/ia64/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/ia64/sys/dev/ctau/if_ct.c#6 integrate
.. //depot/projects/ia64/sys/dev/cx/if_cx.c#7 integrate
.. //depot/projects/ia64/sys/dev/fdc/fdc.c#6 integrate
.. //depot/projects/ia64/sys/dev/fdc/fdcvar.h#5 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#18 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_pci.c#22 integrate
.. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#33 integrate
.. //depot/projects/ia64/sys/i386/conf/PAE#9 integrate
.. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#38 integrate
.. //depot/projects/ia64/sys/kern/kern_conf.c#30 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#65 integrate
.. //depot/projects/ia64/sys/kern/kern_kse.c#4 integrate
.. //depot/projects/ia64/sys/kern/kern_physio.c#14 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#43 integrate
.. //depot/projects/ia64/sys/kern/tty_pty.c#22 integrate
.. //depot/projects/ia64/sys/kern/vfs_aio.c#42 integrate
.. //depot/projects/ia64/sys/kern/vfs_bio.c#71 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#30 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#67 integrate
.. //depot/projects/ia64/sys/modules/Makefile#76 integrate
.. //depot/projects/ia64/sys/netipsec/keydb.h#4 integrate
.. //depot/projects/ia64/sys/rpc/rpcclnt.h#4 integrate
.. //depot/projects/ia64/sys/sys/conf.h#33 integrate
.. //depot/projects/ia64/sys/sys/proc.h#85 integrate
.. //depot/projects/ia64/sys/sys/resource.h#9 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#44 integrate
.. //depot/projects/ia64/usr.bin/dnskeygen/Makefile#2 delete
.. //depot/projects/ia64/usr.bin/dnsquery/Makefile#2 delete
.. //depot/projects/ia64/usr.sbin/Makefile#63 integrate
.. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#14 integrate
.. //depot/projects/ia64/usr.sbin/ndc/Makefile#3 delete

Differences ...

==== //depot/projects/ia64/contrib/bind9/CHANGES#2 (text+ko) ====

@@ -1,4 +1,8 @@
 
+	--- 9.3.0 released ---
+
+1711.	[func]		'rndc unfreeze' has been deprecated by 'rndc thaw'.
+
 	--- 9.3.0rc4 released ---
 
 1709.	[port]		solaris: add SMF support.

==== //depot/projects/ia64/contrib/bind9/bin/named/control.c#2 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.7.2.2.2.10 2004/03/22 01:52:22 marka Exp $ */
+/* $Id: control.c,v 1.7.2.2.2.10.4.1 2004/09/20 01:00:00 marka Exp $ */
 
 #include <config.h>
 
@@ -122,7 +122,8 @@
 		result = ns_server_status(ns_g_server, text);
 	} else if (command_compare(command, NS_COMMAND_FREEZE)) {
 		result = ns_server_freeze(ns_g_server, ISC_TRUE, command);
-	} else if (command_compare(command, NS_COMMAND_UNFREEZE)) {
+	} else if (command_compare(command, NS_COMMAND_UNFREEZE) ||
+		   command_compare(command, NS_COMMAND_THAW)) {
 		result = ns_server_freeze(ns_g_server, ISC_FALSE, command);
 	} else if (command_compare(command, NS_COMMAND_RECURSING)) {
 		result = ns_server_dumprecursing(ns_g_server);

==== //depot/projects/ia64/contrib/bind9/bin/named/include/named/control.h#2 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.h,v 1.6.2.2.2.6 2004/03/08 04:04:20 marka Exp $ */
+/* $Id: control.h,v 1.6.2.2.2.6.6.1 2004/09/20 01:00:01 marka Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
@@ -47,6 +47,7 @@
 #define NS_COMMAND_STATUS	"status"
 #define NS_COMMAND_FREEZE	"freeze"
 #define NS_COMMAND_UNFREEZE	"unfreeze"
+#define NS_COMMAND_THAW		"thaw"
 #define NS_COMMAND_RECURSING	"recursing"
 #define NS_COMMAND_NULL		"null"
 

==== //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.c#2 (text+ko) ====

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.77.2.5.2.12 2004/03/08 04:04:23 marka Exp $ */
+/* $Id: rndc.c,v 1.77.2.5.2.12.6.1 2004/09/20 01:00:01 marka Exp $ */
 
 /*
  * Principal Author: DCL
@@ -99,7 +99,7 @@
 		Retransfer a single zone without checking serial number.\n\
   freeze zone [class [view]]\n\
   		Suspend updates to a dynamic zone.\n\
-  unfreeze zone [class [view]]\n\
+  thaw zone [class [view]]\n\
   		Enable updates to a frozen dynamic zone and reload it.\n\
   reconfig	Reload configuration file and new zones only.\n\
   stats		Write server statistics to the statistics file.\n\

==== //depot/projects/ia64/contrib/bind9/version#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.10 2004/09/01 07:29:40 marka Exp $
+# $Id: version,v 1.26.2.17.2.10.4.1 2004/09/20 01:01:01 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=3
 PATCHVER=0
-RELEASETYPE=rc
-RELEASEVER=4
+RELEASETYPE=
+RELEASEVER=

==== //depot/projects/ia64/etc/defaults/periodic.conf#13 (text+ko) ====

@@ -10,7 +10,7 @@
 # values set in this file.  This eases the upgrade path when defaults
 # are changed and new features are added.
 #
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.29 2004/05/19 09:18:07 joe Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.30 2004/09/23 02:00:51 jkoshy Exp $
 #
 
 # What files override these defaults ?
@@ -128,6 +128,7 @@
 daily_status_security_output="root"			# user or /file
 daily_status_security_noamd="NO"			# Don't check amd mounts
 daily_status_security_logdir="/var/log"			# Directory for logs
+daily_status_security_diff_flags="-b -u"		# flags for diff output
 
 # 100.chksetuid
 daily_status_security_chksetuid_enable="YES"

==== //depot/projects/ia64/etc/mtree/BSD.root.dist#14 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.69 2004/09/21 19:01:41 des Exp $
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.70 2004/09/23 19:33:54 des Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -32,6 +32,8 @@
         ..
         mtree
         ..
+        namedb
+        ..
         ntp             mode=0700
         ..
         pam.d

==== //depot/projects/ia64/etc/periodic/security/security.functions#4 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.4 2004/09/23 02:00:51 jkoshy Exp $
 #
 
 #
@@ -67,7 +67,8 @@
     [ $rc -lt 1 ] && rc=1
     echo ""
     echo "${msg}"
-    diff -b ${LOG}/${label}.today ${tmpf} | eval "${filter}"
+    diff ${daily_status_security_diff_flags} ${LOG}/${label}.today \
+	${tmpf} | eval "${filter}"
     mv ${LOG}/${label}.today ${LOG}/${label}.yesterday || rc=3
     mv ${tmpf} ${LOG}/${label}.today || rc=3
   fi

==== //depot/projects/ia64/lib/bind/config.mk#2 (text+ko) ====

@@ -1,7 +1,11 @@
-# $FreeBSD: src/lib/bind/config.mk,v 1.3 2004/09/22 14:36:12 des Exp $
+# $FreeBSD: src/lib/bind/config.mk,v 1.7 2004/09/23 07:52:51 des Exp $
 
 # BIND version number
-CFLAGS+=	-DVERSION='"9.3.0rc4"'
+.if defined(BIND_DIR) && exists(${BIND_DIR}/version)
+.include	"${BIND_DIR}/version"
+BIND_VERSION=	${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
+CFLAGS+=	-DVERSION='"${BIND_VERSION}"'
+.endif
 
 CFLAGS+=	-DHAVE_CONFIG_H
 
@@ -15,7 +19,7 @@
 CFLAGS+=	-DLIBAGE=${LIBAGE}
 .endif
 
-# GSSAPI support is incomplete in 9.3.0rc4
+# GSSAPI support is incomplete in 9.3.0
 #.if !defined(NO_KERBEROS)
 #CFLAGS+=	-DGSSAPI
 #.endif
@@ -39,7 +43,7 @@
 .endif
 
 # Default file locations
-LOCALSTATEDIR=	/var/run
+LOCALSTATEDIR=	/var
 SYSCONFDIR=	/etc/namedb
 CFLAGS+=	-DNS_LOCALSTATEDIR='"${LOCALSTATEDIR}"'
 CFLAGS+=	-DNS_SYSCONFDIR='"${SYSCONFDIR}"'
@@ -66,7 +70,7 @@
 # Link against POSIX threads library
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 .if defined(NOLIBC_R)
-.error "BIND requires libc_r - define NO_BIND, or undefine NOLIBC_R"
+.error "BIND requires libpthread - define NO_BIND, or undefine NOLIBC_R"
 .endif
 .else
 .if defined(NOLIBPTHREAD)

==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#144 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.778 2004/09/18 18:42:33 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.779 2004/09/23 16:59:14 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -211,6 +211,13 @@
       For more information, see security advisory <ulink
       url="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:13.linux.asc">FreeBSD-SA-04:13</ulink>. &merged;</para>
 
+    <para>A number of programming errors in <application>CVS</application>
+      which allow information disclosure, denial-of-service, or
+      possibly arbitrary code execution, have been fixed
+      via an upgrade to <application>CVS</application> 1.11.17.
+      For more information, see security advisory <ulink
+      url="ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:14.cvs.asc">FreeBSD-SA-04:14</ulink>. &merged;</para>
+
   </sect2>
 
   <sect2 id="kernel">

==== //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.6 2004/09/20 13:32:53 den Exp $
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.10 2004/09/20 13:03:46 den Exp $
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.7 2004/09/23 06:49:40 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.11 2004/09/23 06:22:38 den Exp $
 
-     Original revision: 1.257
+     Original revision: 1.258
 -->
 
 <!--
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.6 2004/09/20 13:32:53 den Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.7 2004/09/23 06:49:40 den Exp $</pubdate>
   </sect1info>
 
   <title>Поддерживаемые устройства</title>
@@ -766,6 +766,8 @@
 
     &hwlist.snd.es137x;
 
+    &hwlist.snd.ess;
+
     <para arch="i386,alpha,amd64">ESS
       <itemizedlist>
 	<listitem>

==== //depot/projects/ia64/sbin/reboot/boot_i386.8#11 (text+ko) ====

@@ -34,9 +34,9 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.46 2004/07/18 21:39:45 silby Exp $
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.48 2004/09/23 15:26:01 brooks Exp $
 .\"
-.Dd April 19, 1994
+.Dd September 23, 2004
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -161,7 +161,7 @@
 .Bx
 portion of the disk.
 See
-.Xr disklabel 8 .
+.Xr bsdlabel 8 .
 By convention, only partition
 .Ql a
 contains a bootable image.
@@ -312,9 +312,9 @@
 .Xr ddb 4 ,
 .Xr ttys 5 ,
 .Xr boot0cfg 8 ,
+.Xr bsdlabel 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
-.Xr disklabel 8 ,
 .Xr halt 8 ,
 .Xr loader 8 ,
 .Xr reboot 8 ,
@@ -360,7 +360,7 @@
 requirement has not been adhered to.
 .Sh BUGS
 The
-.Xr disklabel 5
+.Xr bsdlabel 5
 format used by this version of
 .Bx
 is quite

==== //depot/projects/ia64/share/examples/diskless/clone_root#2 (text+ko) ====

@@ -4,7 +4,7 @@
 #	<Standard BSD copyright>
 # Revised 2001.04.16
 #
-# $FreeBSD: src/share/examples/diskless/clone_root,v 1.1 2001/04/16 06:37:03 luigi Exp $
+# $FreeBSD: src/share/examples/diskless/clone_root,v 1.2 2004/09/23 15:52:42 brooks Exp $
 #
 # clone root filesystem for diskless root stuff
 #
@@ -66,20 +66,20 @@
 #	some manual init is needed here.
 # DEST	the diskless_root dir (goes into /etc/bootptab and /etc/exports
 #	on the server)
-# DEVICES	device entries to create in /dev
 DEST=/diskless_root
-DEVICES="all snd1 bktr0"
 
 # you should not touch these vars:
 # SYSDIRS	system directories and mountpoints
 # DIRS		mountpoints (empty dirs)
 # PWFILES	files related to passwords
 # TOCOPY	files and dirs to copy from root partition
+# USRBINS	binaries from /usr needed for tmp and var scripts
 
 SYSDIRS="dev proc root usr var"
 DIRS="cdrom home mnt"
 PWFILES="master.passwd passwd spwd.db pwd.db"
 TOCOPY="bin boot compat etc modules sbin stand sys"
+USRBINS="/usr/sbin/mtree /usr/sbin/newsyslog /usr/bin/touch"
 
 init_diskless_root() {
 	echo "Cleaning old diskless root ($DEST)"
@@ -89,7 +89,7 @@
 	mkdir -p $DEST && echo "New diskless root created."
 	echo "+++ Now copy original tree from / ..."
 	ex=""
-	(cd / ; tar -clf - ${TOCOPY} ) | (cd $DEST; tar xvf - )
+	(cd / ; tar -clf - ${TOCOPY} ${USRBINS} ) | (cd $DEST; tar xvf - )
 	#(cd / ; find -x dev | cpio -o -H newc ) | \
 	#	(cd $DEST; cpio -i -H newc -d )
 	echo "+++ Fixing permissions on some objects"
@@ -113,10 +113,6 @@
 	done
 	echo "."
 	ln -s /var/tmp ${DEST}/tmp
-	echo "+++ Now use MAKEDEV to create devices ${DEVICES}"
-	(cd $DEST/dev ; cp /dev/MAKEDEV . )
-	(cd $DEST/dev ; /dev/MAKEDEV ${DEVICES} )
-	(cd $DEST/dev ; ln -s /dev/sysmouse mouse )
 	echo "+++ Copying kernel from /sys/compile/DISKLESS"
 	cp /sys/compile/DISKLESS/kernel $DEST/kernel
 	echo "."

==== //depot/projects/ia64/share/man/man5/periodic.conf.5#14 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.50 2004/06/16 08:33:55 ru Exp $
+.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.51 2004/09/23 02:00:52 jkoshy Exp $
 .\"
 .Dd May 30, 2004
 .Dt PERIODIC.CONF 5
@@ -439,6 +439,13 @@
 .Va *_output
 variables above, namely it can be set either to one or more email addresses
 or to an absolute file name.
+.It Va daily_status_security_diff_flags
+.Pq Vt str
+Set to the arguments to pass to the
+.Xr diff 1
+utility when generating differences.
+The default is
+.Fl b Fl u .
 .It Va daily_status_security_chksetuid_enable
 .Pq Vt bool
 Set to
@@ -723,6 +730,7 @@
 .Xr apropos 1 ,
 .Xr calendar 1 ,
 .Xr df 1 ,
+.Xr diff 1 ,
 .Xr gzip 1 ,
 .Xr locate 1 ,
 .Xr man 1 ,

==== //depot/projects/ia64/share/mk/bsd.libnames.mk#25 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.86 2004/09/21 19:01:45 des Exp $
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.87 2004/09/23 07:13:36 ru Exp $
 
 # The include file <bsd.libnames.mk> define library names. 
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this 
@@ -14,8 +14,10 @@
 LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
+.if !defined(NO_BIND)
 LIBBIND?=	${DESTDIR}${LIBDIR}/libbind.a
 LIBBIND9?=	${DESTDIR}${LIBDIR}/libbind9.a
+.endif
 LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
 LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
@@ -50,9 +52,11 @@
 LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
+.if !defined(NO_BIND)
 LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
 LIBISCCC?=	${DESTDIR}${LIBDIR}/libisccc.a
 LIBISCCFG?=	${DESTDIR}${LIBDIR}/libisccfg.a
+.endif
 LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
 LIBKADM5SRV?=	${DESTDIR}${LIBDIR}/libkadm5srv.a
 LIBKAFS5?=	${DESTDIR}${LIBDIR}/libkafs5.a
@@ -62,6 +66,9 @@
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
+.if !defined(NO_BIND)
+LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
+.endif
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a

==== //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#11 (text+ko) ====

@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.13 2004/04/05 23:41:28 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.14 2004/09/23 18:37:36 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
@@ -137,7 +137,7 @@
 {
 	struct file_metadata	*md;
 	Elf_Ehdr		*hdr;
-	struct ia64_pte		pte;
+	pt_entry_t		pte;
 	struct bootinfo		*bi;
 	u_int64_t		psr;
 	UINTN			mapkey, pages, size;
@@ -193,25 +193,17 @@
 	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (28 << 2));
 	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2));
 
-	bzero(&pte, sizeof(pte));
-	pte.pte_p = 1;
-	pte.pte_ma = PTE_MA_WB;
-	pte.pte_a = 1;
-	pte.pte_d = 1;
-	pte.pte_pl = PTE_PL_KERN;
-	pte.pte_ar = PTE_AR_RWX;
-	pte.pte_ppn = 0;
+	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
+	    PTE_PL_KERN | PTE_AR_RWX;
 
 	__asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
 	__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
 	__asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
 	__asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
 	__asm __volatile("srlz.i;;");
-	__asm __volatile("itr.i itr[%0]=%1;;"
-			 :: "r"(0), "r"(*(u_int64_t*)&pte));
+	__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");
-	__asm __volatile("itr.d dtr[%0]=%1;;"
-			 :: "r"(0), "r"(*(u_int64_t*)&pte));
+	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");
 
 	enter_kernel(hdr->e_entry, bi);

==== //depot/projects/ia64/sys/boot/efi/loader/main.c#20 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.21 2004/08/10 02:08:57 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.22 2004/09/23 18:37:36 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
@@ -387,7 +387,7 @@
 	struct ia64_pal_result res;
 	int i, maxtr;
 	struct {
-		struct ia64_pte	pte;
+		pt_entry_t	pte;
 		struct ia64_itir itir;
 		uint64_t	ifa;
 		struct ia64_rr	rr;
@@ -436,28 +436,24 @@
 			continue;
 
 		if (!(res.pal_result[0] & 1))
-			buf.pte.pte_ar = 0;
+			buf.pte &= ~PTE_AR_MASK;
 		if (!(res.pal_result[0] & 2))
-			buf.pte.pte_pl = 0;
+			buf.pte &= ~PTE_PL_MASK;
 		if (!(res.pal_result[0] & 4))
-			buf.pte.pte_d = 0;
+			buf.pte &= ~PTE_DIRTY;
 		if (!(res.pal_result[0] & 8))
-			buf.pte.pte_ma = 0;
-		sprintf(lbuf,
-	"%03d %06x %013lx %013lx %4s %d  %d  %d  %d %d %-3s %d %06x\n",
-			i,
-			buf.rr.rr_rid,
-			buf.ifa >> 12,
-			buf.pte.pte_ppn,
-			psnames[buf.itir.itir_ps],
-			buf.pte.pte_ed,
-			buf.pte.pte_ar,
-			buf.pte.pte_pl,
-			buf.pte.pte_d,
-			buf.pte.pte_a,
-			manames[buf.pte.pte_ma],
-			buf.pte.pte_p,
-			buf.itir.itir_key);
+			buf.pte &= ~PTE_MA_MASK;
+		sprintf(lbuf, "%03d %06x %013lx %013lx %4s %d  %d  %d  %d %d "
+		    "%-3s %d %06x\n", i, buf.rr.rr_rid, buf.ifa >> 12,
+		    (buf.pte & PTE_PPN_MASK) >> 12, psnames[buf.itir.ps],
+		    (buf.pte & PTE_ED) ? 1 : 0,
+		    (int)(buf.pte & PTE_AR_MASK) >> 9,
+		    (int)(buf.pte & PTE_PL_MASK) >> 7,
+		    (buf.pte & PTE_DIRTY) ? 1 : 0,
+		    (buf.pte & PTE_ACCESSED) ? 1 : 0,
+		    manames[(buf.pte & PTE_MA_MASK) >> 2],
+		    (buf.pte & PTE_PRESENT) ? 1 : 0,
+		    buf.itir.key);
 		pager_output(lbuf);
 	}
 	pager_close();

==== //depot/projects/ia64/sys/coda/coda_vfsops.c#14 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.53 2004/09/01 01:19:51 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.54 2004/09/23 12:19:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -152,7 +152,7 @@
     /*
      * See if the device table matches our expectations.
      */
-    if (devsw(dev)->d_open != vc_nb_open)
+    if (dev->si_devsw->d_open != vc_nb_open)
     {
 	MARK_INT_FAIL(CODA_MOUNT_STATS);
 	return(ENXIO);

==== //depot/projects/ia64/sys/conf/NOTES#81 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1278 2004/09/16 20:35:27 glebius Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1279 2004/09/23 08:34:50 phk Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1093,20 +1093,6 @@
 device		snp		#Snoop device - to look at pty/vty/etc..
 device		ccd		#Concatenated disk driver
 
-# Configuring Vinum into the kernel is not necessary, since the kld
-# module gets started automatically when vinum(8) starts.  This
-# device is also untested.  Use at your own risk.
-#
-# The option VINUMDEBUG must match the value set in CFLAGS
-# in src/sbin/vinum/Makefile.  Failure to do so will result in
-# the following message from vinum(8):
-#
-# Can't get vinum config: Invalid argument
-#
-# see vinum(4) for more reasons not to use these options.
-device		vinum		#Vinum concat/mirror/raid driver
-options 	VINUMDEBUG	#enable Vinum debugging hooks
-
 # Kernel side iconv library
 options 	LIBICONV
 

==== //depot/projects/ia64/sys/conf/files#118 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.953 2004/09/16 20:35:27 glebius Exp $
+# $FreeBSD: src/sys/conf/files,v 1.954 2004/09/23 08:34:50 phk Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -829,20 +829,6 @@
 dev/usb/usbdi.c		optional usb
 dev/usb/usbdi_util.c	optional usb
 dev/utopia/utopia.c		optional utopia
-dev/vinum/vinum.c		optional vinum
-dev/vinum/vinumconfig.c		optional vinum
-dev/vinum/vinumdaemon.c		optional vinum
-dev/vinum/vinuminterrupt.c	optional vinum
-dev/vinum/vinumio.c		optional vinum
-dev/vinum/vinumioctl.c		optional vinum
-dev/vinum/vinumlock.c		optional vinum
-dev/vinum/vinummemory.c		optional vinum
-dev/vinum/vinumparser.c		optional vinum
-dev/vinum/vinumraid5.c		optional vinum
-dev/vinum/vinumrequest.c	optional vinum
-dev/vinum/vinumrevive.c		optional vinum
-dev/vinum/vinumstate.c		optional vinum
-dev/vinum/vinumutil.c		optional vinum
 dev/vge/if_vge.c		optional vge
 dev/vx/if_vx.c			optional vx
 dev/vx/if_vx_eisa.c		optional vx eisa

==== //depot/projects/ia64/sys/conf/kern.post.mk#46 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.69 2004/09/17 09:17:33 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.70 2004/09/23 08:34:50 phk Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -59,8 +59,7 @@
 gdbinit:
 	grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \
 	    sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit
-	cp ${S}/../tools/debugscripts/gdbinit.kernel \
-	    ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR}
+	cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR}
 .if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH})
 	cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \
 	    ${.CURDIR}/gdbinit.machine

==== //depot/projects/ia64/sys/conf/options#78 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.484 2004/09/16 20:35:27 glebius Exp $
+# $FreeBSD: src/sys/conf/options,v 1.485 2004/09/23 08:34:50 phk Exp $
 #
 #        On the handling of kernel options
 #
@@ -570,9 +570,6 @@
 UVSCOM_DEFAULT_OPKTSIZE	opt_uvscom.h
 UVSCOM_INTR_INTERVAL	opt_uvscom.h
 
-# Vinum options
-VINUMDEBUG		opt_vinum.h
-
 # Embedded system options
 INIT_PATH		opt_init_path.h
 

==== //depot/projects/ia64/sys/contrib/pf/net/pfvar.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.8 2004/08/12 13:59:44 mlaier Exp $	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.9 2004/09/23 12:44:40 mlaier Exp $	*/
 /*	$OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */
 /* add	$OpenBSD: pfvar.h,v 1.194 2004/05/11 07:34:11 dhartmei Exp $ */
 
@@ -49,16 +49,6 @@
 
 #ifdef __FreeBSD__
 #include <netinet/in.h>
-/*
- * XXX
- *  If we include <netipsec/keydb.h>, we need _KERNEL definition.
- *  This makes pfctl compilation difficult.
- */
-union sockaddr_union {
-	struct sockaddr		sa;
-	struct sockaddr_in	sin;
-	struct sockaddr_in6	sin6;
-};
 #endif
 
 #include <netinet/tcp_fsm.h>
@@ -831,6 +821,15 @@
 #define	pfrts_name	pfrts_t.pfrt_name
 #define pfrts_flags	pfrts_t.pfrt_flags
 
+#ifndef _SOCKADDR_UNION_DEFINED
+#define	_SOCKADDR_UNION_DEFINED
+union sockaddr_union {
+	struct sockaddr		sa;
+	struct sockaddr_in	sin;
+	struct sockaddr_in6	sin6;
+};
+#endif /* _SOCKADDR_UNION_DEFINED */
+
 SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
 struct pfr_kentry {
 	struct radix_node	 pfrke_node[2];

==== //depot/projects/ia64/sys/dev/cp/if_cp.c#3 (text+ko) ====

@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.12 2004/08/13 23:02:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.13 2004/09/23 12:21:10 phk Exp $");
 
 #include <sys/param.h>
 
@@ -2411,23 +2411,10 @@
 
 static int cp_modevent (module_t mod, int type, void *unused)
 {
-	struct cdev *dev;
 	static int load_count = 0;
-	struct cdevsw *cdsw;
 
-#if __FreeBSD_version >= 502103
-	dev = findcdev (makedev(CDEV_MAJOR, 0));
-#else
-	dev = makedev (CDEV_MAJOR, 0);
-#endif
 	switch (type) {
 	case MOD_LOAD:
-		if (dev != NULL &&
-		    (cdsw = devsw (dev)) &&
-		    cdsw->d_maj == CDEV_MAJOR) {
-			printf ("Tau-PCI driver is already in system\n");
-			return (ENXIO);
-		}
 #if __FreeBSD_version >= 500000 && defined NETGRAPH
 		if (ng_newtype (&typestruct))
 			printf ("Failed to register ng_cp\n");

==== //depot/projects/ia64/sys/dev/ctau/if_ct.c#6 (text+ko) ====

@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.15 2004/08/27 22:14:26 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.16 2004/09/23 12:21:11 phk Exp $");
 
 #include <sys/param.h>
  
@@ -2338,23 +2338,10 @@
 
 static int ct_modevent (module_t mod, int type, void *unused)
 {
-	struct cdev *dev;
 	static int load_count = 0;
-	struct cdevsw *cdsw;
 
-#if __FreeBSD_version >= 502103
-	dev = findcdev (makedev(CDEV_MAJOR, 0));
-#else
-	dev = makedev (CDEV_MAJOR, 0);
-#endif
 	switch (type) {
 	case MOD_LOAD:
-		if (dev != NULL &&
-		    (cdsw = devsw (dev)) &&
-		    cdsw->d_maj == CDEV_MAJOR) {
-			printf ("Tau-ISA driver is already in system\n");
-			return (ENXIO);
-		}
 #if __FreeBSD_version >= 500000 && defined NETGRAPH
 		if (ng_newtype (&typestruct))
 			printf ("Failed to register ng_ct\n");

==== //depot/projects/ia64/sys/dev/cx/if_cx.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.31 2004/08/27 22:14:26 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.32 2004/09/23 12:21:11 phk Exp $");
 
 #include <sys/param.h>
 
@@ -2789,23 +2789,10 @@
 
 static int cx_modevent (module_t mod, int type, void *unused)
 {
-	struct cdev *dev;
 	static int load_count = 0;
-	struct cdevsw *cdsw;
 
-#if __FreeBSD_version >= 502103
-	dev = findcdev (makedev(CDEV_MAJOR, 0));
-#else
-	dev = makedev (CDEV_MAJOR, 0);
-#endif
 	switch (type) {
 	case MOD_LOAD:
-		if (dev != NULL &&
-		    (cdsw = devsw (dev)) &&
-		    cdsw->d_maj == CDEV_MAJOR) {
-			printf ("Sigma driver is already in system\n");
-			return (EEXIST);
-		}
 #if __FreeBSD_version >= 500000 && defined NETGRAPH
 		if (ng_newtype (&typestruct))
 			printf ("Failed to register ng_cx\n");

==== //depot/projects/ia64/sys/dev/fdc/fdc.c#6 (text+ko) ====

@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.290 2004/09/17 18:50:38 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.291 2004/09/23 21:12:21 joerg Exp $");
 
 #include "opt_fdc.h"
 
@@ -761,8 +761,17 @@
 			if (fdc->bp == NULL)
 				msleep(&fdc->head, &fdc->fdc_mtx,
 				    PRIBIO, "-", hz);
-		} while (fdc->bp == NULL);
+		} while (fdc->bp == NULL &&
+		    (fdc->flags & FDC_KTHREAD_EXIT) == 0);
 		mtx_unlock(&fdc->fdc_mtx);
+
+		if (fdc->bp == NULL)
+			/*
+			 * Nothing to do, worker thread has been
+			 * requested to stop.
+			 */
+			return (0);
+
 		bp = fdc->bp;
 		fd = fdc->fd = bp->bio_driver1;
 		fdc->retry = 0;
@@ -1118,7 +1127,8 @@
 	fdc = arg;
 	int i;
 
-	for (;;) {
+	fdc->flags |= FDC_KTHREAD_ALIVE;
+	while ((fdc->flags & FDC_KTHREAD_EXIT) == 0) {
 		i = fdc_worker(fdc);
 		if (i && debugflags & 0x20) {
 			if (fdc->bp != NULL) {
@@ -1129,6 +1139,8 @@
 		}
 		fdc->retry += i;
 	}
+	fdc->flags &= ~(FDC_KTHREAD_EXIT | FDC_KTHREAD_ALIVE);
+	wakeup(&fdc->fdc_thread);
 }
 
 /*
@@ -1624,7 +1636,13 @@
 	if ((error = bus_generic_detach(dev)))
 		return (error);
 
-	/* XXX: kill thread */
+	/* kill worker thread */
+	fdc->flags |= FDC_KTHREAD_EXIT;
+	mtx_lock(&fdc->fdc_mtx);
+	while ((fdc->flags & FDC_KTHREAD_ALIVE) != 0)
+		msleep(&fdc->fdc_thread, &fdc->fdc_mtx, PRIBIO, "fdcdet", 0);
+	mtx_unlock(&fdc->fdc_mtx);
+
 	/* reset controller, turn motor off */
 	fdout_wr(fdc, 0);
 

==== //depot/projects/ia64/sys/dev/fdc/fdcvar.h#5 (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/fdc/fdcvar.h,v 1.6 2004/09/17 18:50:38 imp Exp $
+ * $FreeBSD: src/sys/dev/fdc/fdcvar.h,v 1.7 2004/09/23 21:12:21 joerg Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
@@ -46,6 +46,8 @@
 #define FDC_HAS_FIFO	0x10
 #define FDC_NEEDS_RESET	0x20
 #define FDC_NODMA	0x40
+#define FDC_KTHREAD_EXIT	0x1000 /* request worker thread to stop */
+#define FDC_KTHREAD_ALIVE	0x2000 /* worker thread is alive */
 	struct	fd_data *fd;	/* The active drive */
 	int	retry;
 	int	fdout;		/* mirror of the w/o digital output reg */

==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#18 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.75 2004/02/08 19:16:01 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.76 2004/09/23 05:25:22 mjacob Exp $ */
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
@@ -61,10 +61,9 @@
 #include "opt_ddb.h"
 #include "opt_isp.h"
 
-/*
- * Not quite yet
- */
-/* #define	ISP_DAC_SUPPORTED	1 */
+#ifdef	PAE
+#define	ISP_DAC_SUPPORTED	1
+#endif
 
 /*
  * Efficiency- get rid of SBus code && tests unless we need them.

==== //depot/projects/ia64/sys/dev/isp/isp_pci.c#22 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.99 2004/09/07 08:04:09 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.100 2004/09/23 05:25:22 mjacob Exp $");
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<