Module Name: src
Committed By: matt
Date: Fri Jun 26 22:55:06 UTC 2015
Modified Files:
src/sys/arch/sgimips/include: intr.h
src/sys/arch/sgimips/sgimips: machdep.c
Log Message:
Cleanup includes
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sgimips/include/intr.h
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/sgimips/sgimips/machdep.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/sgimips/include/intr.h
diff -u src/sys/arch/sgimips/include/intr.h:1.27 src/sys/arch/sgimips/include/intr.h:1.28
--- src/sys/arch/sgimips/include/intr.h:1.27 Sun Feb 20 07:59:50 2011
+++ src/sys/arch/sgimips/include/intr.h Fri Jun 26 22:55:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.27 2011/02/20 07:59:50 matt Exp $ */
+/* $NetBSD: intr.h,v 1.28 2015/06/26 22:55:06 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -43,8 +43,6 @@
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/evcnt.h>
-#include <mips/cpuregs.h>
-#include <mips/locore.h>
#define NINTR 32
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.140 src/sys/arch/sgimips/sgimips/machdep.c:1.141
--- src/sys/arch/sgimips/sgimips/machdep.c:1.140 Mon Mar 24 19:10:34 2014
+++ src/sys/arch/sgimips/sgimips/machdep.c Fri Jun 26 22:55:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.140 2014/03/24 19:10:34 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.141 2015/06/26 22:55:06 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.140 2014/03/24 19:10:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141 2015/06/26 22:55:06 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -50,10 +50,12 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <sys/reboot.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/malloc.h>
+#include <sys/intr.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/device.h>
@@ -67,18 +69,15 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
+#include <mips/locore.h>
+
#include <machine/reg.h>
#include <machine/psl.h>
-#include <machine/pte.h>
#include <machine/autoconf.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
-#include <machine/intr.h>
#include <machine/bootinfo.h>
-#include <sys/bus.h>
-#include <mips/locore.h>
#include <mips/cache.h>
#include <mips/cache_r5k.h>
#ifdef ENABLE_MIPS4_CACHE_R10K
