CVS commit: src/sys/arch

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Sat Sep  1 12:15:40 UTC 2012

Modified Files:
        src/sys/arch/arm/arm32: intr.c
        src/sys/arch/shark/shark: autoconf.c

Log Message:
Rework includes and include <uvm/uvm_extern.h> for pmap.h


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/arm32/intr.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/shark/shark/autoconf.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/arm/arm32/intr.c
diff -u src/sys/arch/arm/arm32/intr.c:1.33 src/sys/arch/arm/arm32/intr.c:1.34
--- src/sys/arch/arm/arm32/intr.c:1.33	Fri Jul 27 05:36:09 2012
+++ src/sys/arch/arm/arm32/intr.c	Sat Sep  1 12:15:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $	*/
+/*	$NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,16 +36,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/syslog.h>
 
-#include <machine/intr.h>
-#include <machine/cpu.h>
+#include <uvm/uvm_extern.h>
 
 #include <arm/arm32/machdep.h>
  

Index: src/sys/arch/shark/shark/autoconf.c
diff -u src/sys/arch/shark/shark/autoconf.c:1.18 src/sys/arch/shark/shark/autoconf.c:1.19
--- src/sys/arch/shark/shark/autoconf.c:1.18	Sun Jul 29 18:05:46 2012
+++ src/sys/arch/shark/shark/autoconf.c	Sat Sep  1 12:15:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.19 2012/09/01 12:15:39 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2012/09/01 12:15:39 matt Exp $");
 
 #include "opt_md.h"
 
@@ -53,11 +53,15 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
+#include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+
+#include <uvm/uvm_extern.h>
+
 #include <arm/arm32/machdep.h>
+
 #include <machine/bootconfig.h>
-#include <machine/intr.h>
 #include <machine/irqhandler.h>
 
 #include "isa.h"