Module Name: src
Committed By: matt
Date: Sat Jul 9 16:59:40 UTC 2011
Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c rtc.c sb1250_icu.c
systemsw.c
Log Message:
cleanup machine includes
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sbmips/sbmips/systemsw.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/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.20 src/sys/arch/sbmips/sbmips/cpu.c:1.21
--- src/sys/arch/sbmips/sbmips/cpu.c:1.20 Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/cpu.c Sat Jul 9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,21 +33,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/cpu.h>
#include <mips/locore.h>
#include <mips/cache.h>
-#include <machine/cpu.h>
-#include <machine/cpuvar.h>
+#include <sbmips/cpuvar.h>
#include <mips/sibyte/include/zbbusvar.h>
#include <mips/sibyte/include/sb1250_regs.h>
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.49 src/sys/arch/sbmips/sbmips/machdep.c:1.50
--- src/sys/arch/sbmips/sbmips/machdep.c:1.49 Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/machdep.c Sat Jul 9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -58,54 +58,55 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_modular.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/buf.h>
-#include <sys/reboot.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/exec.h>
#include <sys/file.h>
+#include <sys/intr.h>
+#include <sys/kcore.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/msgbuf.h>
-#include <sys/device.h>
-#include <sys/exec.h>
#include <sys/mount.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
#include <sys/syscallargs.h>
-#include <sys/kcore.h>
-#include <sys/ksyms.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
-#include <machine/pte.h>
-#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <machine/swarm.h>
#include <mips/locore.h>
+#include <mips/psl.h>
+#include <mips/pte.h>
+#include <mips/reg.h>
#include <mips/cfe/cfe_api.h>
+#include <sbmips/autoconf.h>
+#include <sbmips/swarm.h>
+
#if 0 /* XXXCGD */
-#include <machine/nvram.h>
+#include <sbmips/nvram.h>
#endif /* XXXCGD */
-#include <machine/leds.h>
+#include <sbmips/leds.h>
#include <mips/sibyte/dev/sbbuswatchvar.h>
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
Index: src/sys/arch/sbmips/sbmips/rtc.c
diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.18 src/sys/arch/sbmips/sbmips/rtc.c:1.19
--- src/sys/arch/sbmips/sbmips/rtc.c:1.18 Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/rtc.c Sat Jul 9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,8 @@
#include <dev/clock_subr.h>
-#include <machine/swarm.h>
-#include <machine/systemsw.h>
+#include <sbmips/swarm.h>
+#include <sbmips/systemsw.h>
#include <mips/locore.h>
#include <mips/sibyte/dev/sbsmbusvar.h>
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12 Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Sat Jul 9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.12 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.12 2011/02/20 07:47:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $");
#define __INTR_PRIVATE
@@ -47,10 +47,11 @@
/* XXX for uvmexp */
#include <uvm/uvm_extern.h>
-#include <machine/cpuvar.h>
-#include <machine/systemsw.h>
#include <mips/locore.h>
+#include <sbmips/cpuvar.h>
+#include <sbmips/systemsw.h>
+
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_int.h>
#include <mips/sibyte/include/sb1250_scd.h>
Index: src/sys/arch/sbmips/sbmips/systemsw.c
diff -u src/sys/arch/sbmips/sbmips/systemsw.c:1.16 src/sys/arch/sbmips/sbmips/systemsw.c:1.17
--- src/sys/arch/sbmips/sbmips/systemsw.c:1.16 Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/systemsw.c Sat Jul 9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: systemsw.c,v 1.16 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: systemsw.c,v 1.17 2011/07/09 16:59:40 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,18 +33,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.16 2011/02/20 07:47:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.17 2011/07/09 16:59:40 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
#include <mips/locore.h>
#include <mips/mips3_clock.h>
-#include <machine/intr.h>
-#include <machine/systemsw.h>
+#include <sbmips/systemsw.h>
/* trivial functions for function switch */
