Module Name: src
Committed By: matt
Date: Sat Sep 1 14:48:06 UTC 2012
Modified Files:
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/arm/sa11x0: sa11x0_irqhandler.c
src/sys/arch/hpcarm/hpcarm: autoconf.c
Log Message:
Move things around for <arm/arm32/machdep.h>
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/hpcarm/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/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.13 src/sys/arch/arm/at91/at91bus.c:1.14
--- src/sys/arch/arm/at91/at91bus.c:1.13 Mon Jul 30 23:35:27 2012
+++ src/sys/arch/arm/at91/at91bus.c Sat Sep 1 14:48:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,12 +27,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_pmap_debug.h"
+/* Define various stack sizes in pages */
+#define IRQ_STACK_SIZE 8
+#define ABT_STACK_SIZE 8
+#ifdef IPKDB
+#define UND_STACK_SIZE 16
+#else
+#define UND_STACK_SIZE 8
+#endif
+
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
@@ -91,15 +100,6 @@ int cnmode = CONMODE;
-/* Define various stack sizes in pages */
-#define IRQ_STACK_SIZE 8
-#define ABT_STACK_SIZE 8
-#ifdef IPKDB
-#define UND_STACK_SIZE 16
-#else
-#define UND_STACK_SIZE 8
-#endif
-
/* boot configuration: */
vm_offset_t physical_start;
vm_offset_t physical_freestart;
Index: src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.17 src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.18
--- src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.17 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c Sat Sep 1 14:48:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $");
#include "opt_irqstats.h"
@@ -77,15 +77,16 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_irqha
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/syslog.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
#include <sys/malloc.h>
+#include <uvm/uvm_extern.h>
+
#include <arm/arm32/machdep.h>
#include <arm/sa11x0/sa11x0_reg.h>
#include <arm/sa11x0/sa11x0_var.h>
-#include <machine/intr.h>
-#include <machine/cpu.h>
-
irqhandler_t *irqhandlers[NIRQS];
u_int actual_mask;
Index: src/sys/arch/hpcarm/hpcarm/autoconf.c
diff -u src/sys/arch/hpcarm/hpcarm/autoconf.c:1.20 src/sys/arch/hpcarm/hpcarm/autoconf.c:1.21
--- src/sys/arch/hpcarm/hpcarm/autoconf.c:1.20 Sun Jul 29 18:05:43 2012
+++ src/sys/arch/hpcarm/hpcarm/autoconf.c Sat Sep 1 14:48:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,23 +36,26 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $");
#include "opt_md.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/reboot.h>
-#include <sys/disklabel.h>
-#include <sys/device.h>
#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/disklabel.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
+#include <sys/reboot.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <arm/arm32/machdep.h>
#include <machine/bootconfig.h>
#include <machine/config_hook.h>
-#include <machine/intr.h>
-#include <arm/arm32/machdep.h>
#include "opt_cputypes.h"
#if defined(CPU_SA1100) || defined(CPU_SA1110)
