PERFORCE change 30446 for review

[Peter Wemm]

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

Change 30446 by peter at peter_overcee on 2003/05/03 00:13:45

	IFC @30445

Affected files ...

.. //depot/projects/hammer/sys/conf/files.amd64#8 integrate
.. //depot/projects/hammer/sys/dev/ct/ct_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/snc/dp83932subr.c#2 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#16 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.h#5 integrate
.. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#5 integrate

Differences ...

==== //depot/projects/hammer/sys/conf/files.amd64#8 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.12 2003/05/03 00:19:42 peter Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.13 2003/05/03 03:30:29 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -33,7 +33,7 @@
 
 amd64/amd64/autoconf.c		standard
 amd64/amd64/busdma_machdep.c	standard
-amd64/amd64/cpu_swtch.S		standard
+amd64/amd64/cpu_switch.S	standard
 amd64/amd64/critical.c		standard
 amd64/amd64/dump_machdep.c	standard
 amd64/amd64/elf_machdep.c	standard

==== //depot/projects/hammer/sys/dev/ct/ct_isa.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.6 2002/09/20 18:15:40 phk Exp $ */
+/* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.7 2003/05/03 02:04:58 nyan Exp $ */
 /*	$NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -142,6 +142,15 @@
 	if (ISA_PNP_PROBE(device_get_parent(dev), dev, ct_pnp_ids) == ENXIO)
 		return ENXIO;
 
+	switch (isa_get_logicalid(dev)) {
+	case 0x0100e7b1:	/* LHA-301 */
+	case 0x110154dc:	/* SC-98III */
+	case 0x4120acb4:	/* IFC-NN */
+		/* XXX - force to SMIT mode */
+		device_set_flags(dev, device_get_flags(dev) | 0x40000);
+		break;
+	}
+
 	if (isa_get_port(dev) == -1)
 		bus_set_resource(dev, SYS_RES_IOPORT, 0,
 				 BSHW_IOBASE, BSHW_IOSZ);

==== //depot/projects/hammer/sys/dev/snc/dp83932subr.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.4 2002/03/20 02:07:42 alfred Exp $	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.5 2003/05/03 01:47:38 nyan Exp $	*/
 /*	$NecBSD: dp83932subr.c,v 1.5.6.2 1999/10/09 05:47:23 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
   
@@ -629,7 +629,7 @@
 
 	if (size > 3)  {
 		if (noffset & 3)  {
-			size_t asize = (~noffset & 3);
+			size_t asize = 4 - (noffset & 3);
 
 			bus_space_read_region_1(memt, memh, noffset,
 			    bptr, asize);
@@ -670,7 +670,7 @@
 
 	if (size > 3)  {
 		if (noffset & 3)  {
-			size_t asize = (~noffset & 3);
+			size_t asize = 4 - (noffset & 3);
 
 			bus_space_write_region_1(memt, memh, noffset,
 			    bptr, asize);
@@ -712,7 +712,7 @@
 
 	if (size > 3)  {
 		if (noffset & 3)  {
-			size_t asize = (~noffset & 3);
+			size_t asize = 4 - (noffset & 3);
 
 			bus_space_set_region_1(memt, memh, noffset, 0, asize);
 			noffset += asize;

==== //depot/projects/hammer/sys/vm/vm_object.c#16 (text+ko) ====

@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/vm/vm_object.c,v 1.281 2003/05/02 04:55:21 alc Exp $
+ * $FreeBSD: src/sys/vm/vm_object.c,v 1.282 2003/05/03 04:21:16 alc Exp $
  */
 
 /*
@@ -143,7 +143,6 @@
 vm_object_t kmem_object;
 static struct vm_object kernel_object_store;
 static struct vm_object kmem_object_store;
-extern int vm_pageout_page_count;
 
 static long object_collapses;
 static long object_bypasses;

==== //depot/projects/hammer/sys/vm/vm_pageout.h#5 (text+ko) ====

@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.35 2003/04/29 18:49:25 alc Exp $
+ * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.36 2003/05/03 04:21:16 alc Exp $
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
@@ -79,6 +79,7 @@
 extern int vm_pages_needed;	/* should be some "event" structure */
 extern int vm_pageout_pages_needed;
 extern int vm_pageout_deficit;
+extern int vm_pageout_page_count;
 
 /*
  * Swap out requests

==== //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#5 (text+ko) ====

@@ -8,7 +8,7 @@
 # Copyright 1998-2003 Douglas Barton
 # DougB at FreeBSD.org
 
-# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.45 2003/05/02 11:07:58 dougb Exp $
+# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.46 2003/05/03 06:35:19 dougb Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
@@ -656,8 +656,8 @@
   case "${PRESERVE_FILES}" in
   [Yy][Ee][Ss])
     if [ -f "${3}/${2##*/}" ]; then
-      mkdir -p ${PRESERVE_FILES_DIR}
-      cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}
+      mkdir -p ${PRESERVE_FILES_DIR}/${2%/*}
+      cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*}
     fi
     ;;
   esac