PERFORCE change 31492 for review

[Peter Wemm]

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

Change 31492 by peter at peter_daintree on 2003/05/19 15:49:29

	IFC @31491

Affected files ...

.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate
.. //depot/projects/hammer/sys/conf/Makefile.amd64#10 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#10 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#11 integrate

Differences ...

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 (text+ko) ====

@@ -1,8 +1,32 @@
 <!--
-	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.3 2003/01/12 18:27:03 roam Exp $
+	$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.6 2003/05/19 22:15:17 bmah Exp $
 -->
 <sect1 id="proc-ia64">
   <title>Supported Processors and Motherboards</title>
 
-  <para>Need to write this section.</para>
+  <para>Currently supported processors are the 
+    <ulink url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>
+    and the <ulink url="http://www.intel.com/design/itanium2/index.htm">Itanium 2</ulink>.</para>
+
+  <para>Supported chipsets include:</para>
+   <itemizedlist>
+     <listitem>
+       <para>HP zx1 (only on development branch, see the 
+         <ulink url="http://perforce.freebsd.org/">Perforce repository</ulink>)</para>
+     </listitem>
+     <listitem>
+       <para>HP i2000
+     </listitem>
+     <listitem>
+       <para>Intel 460GX</para>
+     </listitem>
+     <listitem>
+       <para>Intel E8870</para>
+     </listitem>
+   </itemizedlist>
+
+  <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
+    configurations are under active development.  At this time,
+    SMP-enabled systems are considered less stable.  The current
+    priorities are UP fixes to improve stability.</para>
 </sect1>

==== //depot/projects/hammer/sys/conf/Makefile.amd64#10 (text+ko) ====

@@ -1,19 +1,19 @@
-# Makefile.x86_64 -- with config changes.
+# Makefile.amd64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.7 2003/05/10 01:12:24 peter Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.8 2003/05/19 22:15:30 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/x86_64/conf/``machineid''
+#	/sys/amd64/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/conf/Makefile.x86_64
+#	/sys/conf/Makefile.amd64
 # after which config should be rerun for all machines.
 #
 

==== //depot/projects/hammer/sys/conf/options.amd64#10 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.7 2003/05/14 04:10:49 peter Exp $
-# Options specific to the AMD x86-64 platform kernels
+# $FreeBSD: src/sys/conf/options.amd64,v 1.8 2003/05/19 22:19:02 peter Exp $
+# Options specific to AMD64 platform kernels
 
 MAXMEM
 PERFMON			opt_perfmon.h

==== //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#11 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.134 2003/04/29 13:36:04 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.135 2003/05/19 22:35:00 peter Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
@@ -277,15 +277,18 @@
 		for (bsize = NFS_FABLKSIZE; ; bsize *= 2) {
 			sbp->f_bsize = bsize;
 			tquad = fxdr_hyper(&sfp->sf_tbytes);
-			if ((tquad / bsize) > LONG_MAX)
+			if (((long)(tquad / bsize) > LONG_MAX) ||
+			    ((long)(tquad / bsize) < LONG_MIN))
 				continue;
 			sbp->f_blocks = tquad / bsize;
 			tquad = fxdr_hyper(&sfp->sf_fbytes);
-			if ((tquad / bsize) > LONG_MAX)
+			if (((long)(tquad / bsize) > LONG_MAX) ||
+			    ((long)(tquad / bsize) < LONG_MIN))
 				continue;
 			sbp->f_bfree = tquad / bsize;
 			tquad = fxdr_hyper(&sfp->sf_abytes);
-			if ((tquad / bsize) > LONG_MAX)
+			if (((long)(tquad / bsize) > LONG_MAX) ||
+			    ((long)(tquad / bsize) < LONG_MIN))
 				continue;
 			sbp->f_bavail = tquad / bsize;
 			sbp->f_files = (fxdr_unsigned(int32_t,