Module Name: src
Committed By: uebayasi
Date: Tue Nov 9 06:06:31 UTC 2010
Modified Files:
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/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.10.88.5 -r1.10.88.6 src/sys/arch/powerpc/conf/files.ibm4xx
cvs rdiff -u -r1.14.98.3 -r1.14.98.4 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.20.20.4 -r1.20.20.5 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.52.2.4 -r1.52.2.5 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.66.2.5 -r1.66.2.6 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.40.2.6 -r1.40.2.7 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/powerpc/conf/files.ibm4xx
diff -u src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.5 src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.6
--- src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.5 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/conf/files.ibm4xx Tue Nov 9 06:06:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ibm4xx,v 1.10.88.5 2010/11/09 06:03:39 uebayasi Exp $
+# $NetBSD: files.ibm4xx,v 1.10.88.6 2010/11/09 06:06:30 uebayasi Exp $
#
# IBM 4xx specific configuration info
@@ -69,7 +69,6 @@
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]}
@@ -79,10 +78,3 @@
# 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.3 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.4
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.3 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 9 06:06:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.14.98.3 2010/11/09 06:03:39 uebayasi Exp $ */
+/* $NetBSD: plb.c,v 1.14.98.4 2010/11/09 06:06:30 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.3 2010/11/09 06:03:39 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.14.98.4 2010/11/09 06:06:30 uebayasi Exp $");
#include "locators.h"
#include "emac.h"
@@ -100,11 +100,7 @@
{ 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.4 src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.5
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.4 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20.20.4 2010/11/09 06:03:39 uebayasi Exp $ */
+/* $NetBSD: bus_space.c,v 1.20.20.5 2010/11/09 06:06:31 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.4 2010/11/09 06:03:39 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.20.5 2010/11/09 06:06:31 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,12 +41,7 @@
#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/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.52.2.4 src/sys/arch/x86/x86/bus_dma.c:1.52.2.5
--- src/sys/arch/x86/x86/bus_dma.c:1.52.2.4 Tue Nov 9 06:03:40 2010
+++ src/sys/arch/x86/x86/bus_dma.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.52.2.4 2010/11/09 06:03:40 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.52.2.5 2010/11/09 06:06:31 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.4 2010/11/09 06:03:40 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52.2.5 2010/11/09 06:06:31 uebayasi Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -101,12 +101,7 @@
#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.5 src/sys/arch/x86/x86/cpu.c:1.66.2.6
--- src/sys/arch/x86/x86/cpu.c:1.66.2.5 Tue Nov 9 06:03:40 2010
+++ src/sys/arch/x86/x86/cpu.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.66.2.5 2010/11/09 06:03:40 uebayasi Exp $ */
+/* $NetBSD: cpu.c,v 1.66.2.6 2010/11/09 06:06:31 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.5 2010/11/09 06:03:40 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66.2.6 2010/11/09 06:06:31 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -84,12 +84,7 @@
#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.6 src/sys/arch/xen/x86/cpu.c:1.40.2.7
--- src/sys/arch/xen/x86/cpu.c:1.40.2.6 Tue Nov 9 06:03:41 2010
+++ src/sys/arch/xen/x86/cpu.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.40.2.6 2010/11/09 06:03:41 uebayasi Exp $ */
+/* $NetBSD: cpu.c,v 1.40.2.7 2010/11/09 06:06:31 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.6 2010/11/09 06:03:41 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40.2.7 2010/11/09 06:06:31 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -86,12 +86,7 @@
#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>
