Module Name: src
Committed By: uebayasi
Date: Tue Nov 9 06:03:41 UTC 2010
Modified Files:
src/sys/arch/amd64/conf [uebayasi-xip]: XEN3_DOM0
src/sys/arch/hp700/dev [uebayasi-xip]: dino.c elroy.c
src/sys/arch/hp700/hp700 [uebayasi-xip]: machdep.c
src/sys/arch/i386/conf [uebayasi-xip]: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/stand/boot [uebayasi-xip]: boot2.c
src/sys/arch/i386/stand/pxeboot [uebayasi-xip]: main.c
src/sys/arch/macppc/dev [uebayasi-xip]: pbms.c
src/sys/arch/mips/mips [uebayasi-xip]: locore_mips1.S
src/sys/arch/powerpc/conf [uebayasi-xip]: files.ibm4xx
src/sys/arch/powerpc/ibm4xx/dev [uebayasi-xip]: plb.c
src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_space.c
src/sys/arch/sparc/stand/ofwboot [uebayasi-xip]: boot.c
src/sys/arch/sparc64/sparc64 [uebayasi-xip]: vm_machdep.c
src/sys/arch/x86/include [uebayasi-xip]: pci_machdep_common.h
src/sys/arch/x86/pci [uebayasi-xip]: pciide_machdep.c
src/sys/arch/x86/x86 [uebayasi-xip]: bus_dma.c cpu.c
src/sys/arch/xen/x86 [uebayasi-xip]: cpu.c
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.2 -r1.48.2.3 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/arch/hp700/dev/elroy.c
cvs rdiff -u -r1.77.2.2 -r1.77.2.3 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.233.2.4 -r1.233.2.5 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.963.2.4 -r1.963.2.5 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/arch/i386/stand/pxeboot/main.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/macppc/dev/pbms.c
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/arch/mips/mips/locore_mips1.S
cvs rdiff -u -r1.10.88.4 -r1.10.88.5 src/sys/arch/powerpc/conf/files.ibm4xx
cvs rdiff -u -r1.14.98.2 -r1.14.98.3 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.20.20.3 -r1.20.20.4 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.21.2.2 -r1.21.2.3 src/sys/arch/sparc/stand/ofwboot/boot.c
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/arch/sparc64/sparc64/vm_machdep.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 \
src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/x86/pci/pciide_machdep.c
cvs rdiff -u -r1.52.2.3 -r1.52.2.4 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.66.2.4 -r1.66.2.5 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.40.2.5 -r1.40.2.6 src/sys/arch/xen/x86/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.2 src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.3
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.2 Tue Aug 17 06:43:53 2010
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.48.2.2 2010/08/17 06:43:53 uebayasi Exp $
+# $NetBSD: XEN3_DOM0,v 1.48.2.3 2010/11/09 06:03:37 uebayasi Exp $
include "arch/amd64/conf/std.xen"
@@ -432,6 +432,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.22.2.1 src/sys/arch/hp700/dev/dino.c:1.22.2.2
--- src/sys/arch/hp700/dev/dino.c:1.22.2.1 Fri Apr 30 14:39:23 2010
+++ src/sys/arch/hp700/dev/dino.c Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $ */
+/* $NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $");
/* #include "cardbus.h" */
@@ -955,7 +955,6 @@
p++;
}
- c /= 2;
while (c--)
*a++ = *p;
}
@@ -977,7 +976,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*a++ = *p;
}
@@ -1008,7 +1006,6 @@
p++;
}
- c /= 2;
while (c--)
*p = *a++;
}
@@ -1030,7 +1027,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*p = *a++;
}
@@ -1206,7 +1202,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
@@ -1232,7 +1227,6 @@
{
volatile uint32_t *p;
- c /= 4;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint32_t *)h;
@@ -1262,7 +1256,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
Index: src/sys/arch/hp700/dev/elroy.c
diff -u src/sys/arch/hp700/dev/elroy.c:1.8.2.1 src/sys/arch/hp700/dev/elroy.c:1.8.2.2
--- src/sys/arch/hp700/dev/elroy.c:1.8.2.1 Fri Apr 30 14:39:23 2010
+++ src/sys/arch/hp700/dev/elroy.c Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.8.2.1 2010/04/30 14:39:23 uebayasi Exp $ */
+/* $NetBSD: elroy.c,v 1.8.2.2 2010/11/09 06:03:37 uebayasi Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -706,7 +706,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*q++ = *p;
}
@@ -719,7 +718,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*q++ = *p;
}
@@ -732,7 +730,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*q++ = *p;
}
@@ -746,7 +743,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*p = *q++;
}
@@ -760,7 +756,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*p = *q++;
}
@@ -774,7 +769,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*p = *q++;
}
@@ -885,7 +879,6 @@
{
volatile uint16_t *p, *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -898,7 +891,6 @@
{
volatile uint32_t *p, *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -911,7 +903,6 @@
{
volatile uint64_t *p, *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
@@ -925,7 +916,6 @@
volatile uint16_t *p;
const uint16_t *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -939,7 +929,6 @@
volatile uint32_t *p;
const uint32_t *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -953,7 +942,6 @@
volatile uint64_t *p;
const uint64_t *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.77.2.2 src/sys/arch/hp700/hp700/machdep.c:1.77.2.3
--- src/sys/arch/hp700/hp700/machdep.c:1.77.2.2 Tue Aug 17 06:44:24 2010
+++ src/sys/arch/hp700/hp700/machdep.c Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.77.2.2 2010/08/17 06:44:24 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.77.2.3 2010/11/09 06:03:37 uebayasi Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.77.2.2 2010/08/17 06:44:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.77.2.3 2010/11/09 06:03:37 uebayasi Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -843,6 +843,12 @@
case HPPA_BOARD_HP705:
return hpcxs;
+ case HPPA_BOARD_HPE23:
+ case HPPA_BOARD_HPE25:
+ case HPPA_BOARD_HPE35:
+ case HPPA_BOARD_HPE45:
+ return hpcxl;
+
case HPPA_BOARD_HP735_99:
case HPPA_BOARD_HP755_99:
case HPPA_BOARD_HP755_125:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.233.2.4 src/sys/arch/i386/conf/ALL:1.233.2.5
--- src/sys/arch/i386/conf/ALL:1.233.2.4 Sat Nov 6 08:08:17 2010
+++ src/sys/arch/i386/conf/ALL Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.233.2.4 2010/11/06 08:08:17 uebayasi Exp $
+# $NetBSD: ALL,v 1.233.2.5 2010/11/09 06:03:37 uebayasi Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.233.2.4 $"
+#ident "ALL-$Revision: 1.233.2.5 $"
maxusers 64 # estimated number of users
@@ -486,6 +486,7 @@
ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,
# watchdog, SpeedStep and HPET
hpet0 at ichlpcib? # High Precision Event Timer
+fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
gpio* at gcscpcib? # timecounter, watchdog and GPIO
piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep
@@ -904,6 +905,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.963.2.4 src/sys/arch/i386/conf/GENERIC:1.963.2.5
--- src/sys/arch/i386/conf/GENERIC:1.963.2.4 Sat Nov 6 08:08:18 2010
+++ src/sys/arch/i386/conf/GENERIC Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.963.2.4 2010/11/06 08:08:18 uebayasi Exp $
+# $NetBSD: GENERIC,v 1.963.2.5 2010/11/09 06:03:37 uebayasi Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.963.2.4 $"
+#ident "GENERIC-$Revision: 1.963.2.5 $"
maxusers 64 # estimated number of users
@@ -856,6 +856,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.27.2.2 src/sys/arch/i386/conf/XEN3_DOM0:1.27.2.3
--- src/sys/arch/i386/conf/XEN3_DOM0:1.27.2.2 Tue Aug 17 06:44:35 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.27.2.2 2010/08/17 06:44:35 uebayasi Exp $
+# $NetBSD: XEN3_DOM0,v 1.27.2.3 2010/11/09 06:03:37 uebayasi Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -415,6 +415,8 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
+siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
Index: src/sys/arch/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.47.2.1 src/sys/arch/i386/stand/boot/boot2.c:1.47.2.2
--- src/sys/arch/i386/stand/boot/boot2.c:1.47.2.1 Fri Apr 30 14:39:31 2010
+++ src/sys/arch/i386/stand/boot/boot2.c Tue Nov 9 06:03:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.47.2.1 2010/04/30 14:39:31 uebayasi Exp $ */
+/* $NetBSD: boot2.c,v 1.47.2.2 2010/11/09 06:03:38 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -386,8 +386,8 @@
"ls [path]\n"
"dev xd[N[x]]:\n"
"consdev {pc|com[0123]|com[0123]kbd|auto}\n"
- "vesa {enabled|disabled|list|modenum}\n"
- "modules {enabled|disabled}\n"
+ "vesa {modenum|on|off|enabled|disabled|list}\n"
+ "modules {on|off|enabled|disabled}\n"
"load {path_to_module}\n"
"multiboot [xdNx:][filename] [<args>]\n"
"help|?\n"
Index: src/sys/arch/i386/stand/pxeboot/main.c
diff -u src/sys/arch/i386/stand/pxeboot/main.c:1.24.2.1 src/sys/arch/i386/stand/pxeboot/main.c:1.24.2.2
--- src/sys/arch/i386/stand/pxeboot/main.c:1.24.2.1 Fri Apr 30 14:39:31 2010
+++ src/sys/arch/i386/stand/pxeboot/main.c Tue Nov 9 06:03:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.24.2.1 2010/04/30 14:39:31 uebayasi Exp $ */
+/* $NetBSD: main.c,v 1.24.2.2 2010/11/09 06:03:38 uebayasi Exp $ */
/*
* Copyright (c) 1996
@@ -194,9 +194,9 @@
"boot [filename] [-adsqv]\n"
" (ex. \"netbsd.old -s\"\n"
"consdev {pc|com[0123]|com[0123]kbd|auto}\n"
- "vesa {enabled|disabled|list|modenum}\n"
+ "vesa {modenum|on|off|enabled|disabled|list}\n"
"multiboot [filename] [<args>]\n"
- "modules {enabled|disabled}\n"
+ "modules {on|off|enabled|disabled}\n"
"load {path_to_module}\n"
"help|?\n"
"quit\n");
Index: src/sys/arch/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.9 src/sys/arch/macppc/dev/pbms.c:1.9.2.1
--- src/sys/arch/macppc/dev/pbms.c:1.9 Thu Nov 5 05:37:30 2009
+++ src/sys/arch/macppc/dev/pbms.c Tue Nov 9 06:03:38 2010
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.9 2009/11/05 05:37:30 dyoung Exp $ */
+/* $Id: pbms.c,v 1.9.2.1 2010/11/09 06:03:38 uebayasi Exp $ */
/*
* Copyright (c) 2005, Johan Wall�n
@@ -367,7 +367,7 @@
sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint);
- USB_ATTACH_SUCCESS_RETURN;
+ return;
}
Index: src/sys/arch/mips/mips/locore_mips1.S
diff -u src/sys/arch/mips/mips/locore_mips1.S:1.67 src/sys/arch/mips/mips/locore_mips1.S:1.67.2.1
--- src/sys/arch/mips/mips/locore_mips1.S:1.67 Mon Dec 14 00:46:06 2009
+++ src/sys/arch/mips/mips/locore_mips1.S Tue Nov 9 06:03:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips1.S,v 1.67 2009/12/14 00:46:06 matt Exp $ */
+/* $NetBSD: locore_mips1.S,v 1.67.2.1 2010/11/09 06:03:38 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -925,12 +925,12 @@
tlbr # Read from the TLB
mfc0 t2, MIPS_COP_0_TLB_HI # fetch the hi entry
mfc0 t3, MIPS_COP_0_TLB_LOW # fetch the low entry
- sw t2, 0(a1)
- sw t3, 4(a1)
mtc0 t0, MIPS_COP_0_TLB_HI # restore PID
- j ra
mtc0 v1, MIPS_COP_0_STATUS # Restore the status register
+ sw t2, 0(a1)
+ j ra
+ sw t3, 4(a1)
END(mips1_TLBRead)
/*----------------------------------------------------------------------------
Index: src/sys/arch/powerpc/conf/files.ibm4xx
diff -u src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.4 src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.5
--- src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.4 Thu Aug 19 01:02:21 2010
+++ src/sys/arch/powerpc/conf/files.ibm4xx Tue Nov 9 06:03:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ibm4xx,v 1.10.88.4 2010/08/19 01:02:21 uebayasi Exp $
+# $NetBSD: files.ibm4xx,v 1.10.88.5 2010/11/09 06:03:39 uebayasi Exp $
#
# IBM 4xx specific configuration info
@@ -69,6 +69,7 @@
device gpiic: i2cbus, i2c_bitbang
attach gpiic at opb
file arch/powerpc/ibm4xx/dev/gpiic_opb.c gpiic
+<<<<<<< files.ibm4xx
# External bus
device exb {[addr = -1]}
@@ -78,3 +79,10 @@
# FlashROM on external bus
attach flash at exb with flash_exb
file arch/powerpc/ibm4xx/dev/flash_exb.c flash_exb needs-flag
+=======
+
+# External bus
+#device exb {[addr = -1]}
+#attach exb at plb
+#file arch/powerpc/ibm4xx/dev/exb.c exb
+>>>>>>> 1.12
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.2 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.3
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.2 Wed Aug 11 13:53:22 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 9 06:03:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.14.98.2 2010/08/11 13:53:22 uebayasi Exp $ */
+/* $NetBSD: plb.c,v 1.14.98.3 2010/11/09 06:03:39 uebayasi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.14.98.2 2010/08/11 13:53:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.14.98.3 2010/11/09 06:03:39 uebayasi Exp $");
#include "locators.h"
#include "emac.h"
@@ -100,7 +100,11 @@
{ IBM405GPR, "ecc", },
{ IBM405GPR, "opb", },
{ IBM405GPR, "pchb", },
+<<<<<<< plb.c
{ IBM405GPR, "exb", },
+=======
+ { IBM405GPR, "exb", },
+>>>>>>> 1.16
/* AMCC 405EX / EXR */
{ AMCC405EX, "cpu", },
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.3 src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.4
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.3 Tue Nov 2 14:05:28 2010
+++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 9 06:03:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $ */
+/* $NetBSD: bus_space.c,v 1.20.20.4 2010/11/09 06:03:39 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.20.4 2010/11/09 06:03:39 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,12 @@
#include <sys/extent.h>
#include <sys/malloc.h>
+<<<<<<< bus_space.c
#include <uvm/uvm_extern.h>
#include <uvm/uvm_prot.h>
+=======
+#include <uvm/uvm.h>
+>>>>>>> 1.23
#define _POWERPC_BUS_SPACE_PRIVATE
#include <machine/bus.h>
Index: src/sys/arch/sparc/stand/ofwboot/boot.c
diff -u src/sys/arch/sparc/stand/ofwboot/boot.c:1.21.2.2 src/sys/arch/sparc/stand/ofwboot/boot.c:1.21.2.3
--- src/sys/arch/sparc/stand/ofwboot/boot.c:1.21.2.2 Fri Oct 22 07:21:33 2010
+++ src/sys/arch/sparc/stand/ofwboot/boot.c Tue Nov 9 06:03:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.21.2.2 2010/10/22 07:21:33 uebayasi Exp $ */
+/* $NetBSD: boot.c,v 1.21.2.3 2010/11/09 06:03:39 uebayasi Exp $ */
/*
* Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved.
@@ -95,6 +95,7 @@
int debug = 0;
int compatmode = 0;
+extern char twiddle_toggle;
#if 0
static void
@@ -190,6 +191,7 @@
kernel[end2 - start2] = '\0';
}
+ twiddle_toggle = 1;
strcpy(options, ap);
while (*ap != '\0' && *ap != ' ' && *ap != '\t' && *ap != '\n') {
BOOT_FLAG(*ap, v);
@@ -200,6 +202,9 @@
case 'C':
compatmode = 1;
break;
+ case 'T':
+ twiddle_toggle = 1 - twiddle_toggle;
+ break;
default:
break;
}
Index: src/sys/arch/sparc64/sparc64/vm_machdep.c
diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.91 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.91.2.1
--- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.91 Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/vm_machdep.c Tue Nov 9 06:03:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.91 2009/11/21 04:16:52 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.91.2.1 2010/11/09 06:03:40 uebayasi Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.91 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.91.2.1 2010/11/09 06:03:40 uebayasi Exp $");
#include "opt_multiprocessor.h"
@@ -223,7 +223,7 @@
opcb->pcb_cwp = getcwp();
}
#ifdef DIAGNOSTIC
- else if (l1 != &lwp0) /* XXX is this valid? */
+ else if (l1 != &lwp0)
panic("cpu_lwp_fork: curlwp");
#endif
#ifdef DEBUG
Index: src/sys/arch/x86/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.3.2.2 src/sys/arch/x86/include/pci_machdep_common.h:1.3.2.3
--- src/sys/arch/x86/include/pci_machdep_common.h:1.3.2.2 Fri Apr 30 14:39:57 2010
+++ src/sys/arch/x86/include/pci_machdep_common.h Tue Nov 9 06:03:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.h,v 1.3.2.2 2010/04/30 14:39:57 uebayasi Exp $ */
+/* $NetBSD: pci_machdep_common.h,v 1.3.2.3 2010/11/09 06:03:40 uebayasi Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -37,6 +37,9 @@
* Machine-specific definitions for PCI autoconfiguration.
*/
#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#ifndef XEN
+#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
+#endif
/*
* i386-specific PCI structure and type definitions.
Index: src/sys/arch/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.9 src/sys/arch/x86/pci/pciide_machdep.c:1.9.2.1
--- src/sys/arch/x86/pci/pciide_machdep.c:1.9 Fri May 1 09:26:34 2009
+++ src/sys/arch/x86/pci/pciide_machdep.c Tue Nov 9 06:03:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.9.2.1 2010/11/09 06:03:40 uebayasi Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.9.2.1 2010/11/09 06:03:40 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,3 +90,10 @@
PCIIDE_CHANNEL_NAME(chan), irq);
return cookie;
}
+
+void
+pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc, int chan, void *cookie)
+{
+ isa_intr_disestablish(NULL, cookie);
+ return;
+}
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.52.2.3 src/sys/arch/x86/x86/bus_dma.c:1.52.2.4
--- src/sys/arch/x86/x86/bus_dma.c:1.52.2.3 Fri Oct 22 07:21:42 2010
+++ src/sys/arch/x86/x86/bus_dma.c Tue Nov 9 06:03:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.52.2.3 2010/10/22 07:21:42 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.52.2.4 2010/11/09 06:03:40 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52.2.3 2010/10/22 07:21:42 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52.2.4 2010/11/09 06:03:40 uebayasi Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -101,8 +101,12 @@
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
+<<<<<<< bus_dma.c
#include <uvm/uvm_extern.h>
#include <uvm/uvm_page.h>
+=======
+#include <uvm/uvm.h>
+>>>>>>> 1.56
extern paddr_t avail_end;
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.66.2.4 src/sys/arch/x86/x86/cpu.c:1.66.2.5
--- src/sys/arch/x86/x86/cpu.c:1.66.2.4 Fri Oct 22 07:21:42 2010
+++ src/sys/arch/x86/x86/cpu.c Tue Nov 9 06:03:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.66.2.4 2010/10/22 07:21:42 uebayasi Exp $ */
+/* $NetBSD: cpu.c,v 1.66.2.5 2010/11/09 06:03:40 uebayasi Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66.2.4 2010/10/22 07:21:42 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66.2.5 2010/11/09 06:03:40 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -84,8 +84,12 @@
#include <sys/atomic.h>
#include <sys/reboot.h>
+<<<<<<< cpu.c
#include <uvm/uvm_extern.h>
#include <uvm/uvm_page.h>
+=======
+#include <uvm/uvm.h>
+>>>>>>> 1.78
#include <machine/cpufunc.h>
#include <machine/cpuvar.h>
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.40.2.5 src/sys/arch/xen/x86/cpu.c:1.40.2.6
--- src/sys/arch/xen/x86/cpu.c:1.40.2.5 Sat Nov 6 08:08:23 2010
+++ src/sys/arch/xen/x86/cpu.c Tue Nov 9 06:03:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.40.2.5 2010/11/06 08:08:23 uebayasi Exp $ */
+/* $NetBSD: cpu.c,v 1.40.2.6 2010/11/09 06:03:41 uebayasi Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40.2.5 2010/11/06 08:08:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40.2.6 2010/11/09 06:03:41 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -86,8 +86,12 @@
#include <sys/atomic.h>
#include <sys/reboot.h>
+<<<<<<< cpu.c
#include <uvm/uvm_extern.h>
#include <uvm/uvm_page.h>
+=======
+#include <uvm/uvm.h>
+>>>>>>> 1.51
#include <machine/cpufunc.h>
#include <machine/cpuvar.h>
