Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/uebayasi-xip]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/65c5d67d5d06
branches: uebayasi-xip
changeset: 751844:65c5d67d5d06
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Tue Nov 09 06:06:30 2010 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/powerpc/conf/files.ibm4xx | 10 +---------
sys/arch/powerpc/ibm4xx/dev/plb.c | 8 ++------
sys/arch/powerpc/powerpc/bus_space.c | 9 ++-------
sys/arch/x86/x86/bus_dma.c | 9 ++-------
sys/arch/x86/x86/cpu.c | 9 ++-------
sys/arch/xen/x86/cpu.c | 9 ++-------
6 files changed, 11 insertions(+), 43 deletions(-)
diffs (182 lines):
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/powerpc/conf/files.ibm4xx
--- a/sys/arch/powerpc/conf/files.ibm4xx Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/powerpc/conf/files.ibm4xx Tue Nov 09 06:06:30 2010 +0000
@@ -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
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/powerpc/ibm4xx/dev/plb.c
--- a/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 09 06:06:30 2010 +0000
@@ -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", },
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/powerpc/powerpc/bus_space.c
--- a/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 09 06:06:30 2010 +0000
@@ -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>
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/x86/x86/bus_dma.c
--- a/sys/arch/x86/x86/bus_dma.c Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/x86/x86/bus_dma.c Tue Nov 09 06:06:30 2010 +0000
@@ -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;
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/x86/x86/cpu.c Tue Nov 09 06:06:30 2010 +0000
@@ -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>
diff -r b121740489fd -r 65c5d67d5d06 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c Tue Nov 09 06:03:26 2010 +0000
+++ b/sys/arch/xen/x86/cpu.c Tue Nov 09 06:06:30 2010 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index