Subject: ARM CPU configuration re-work
To: None <port-arm@netbsd.org>
From: Jason R Thorpe <thorpej@wasabisystems.com>
List: port-arm
Date: 04/11/2002 20:29:20
--tsOsTdHNUZQcU9Ye
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I want to be able to more easily tell which ARM architecture versions
are configured into a given kernel, as well as to be able to shave some
cycles by eliminating pointer indirection for the cpufunc's.
In prep for this, I've added a new header that computes some of this
information for me.
Diff attached -- please sanity-check -- I've removed that appeared
to be needless inclusions of "opt_cputypes.h".
--
-- Jason R. Thorpe <thorpej@wasabisystems.com>
--tsOsTdHNUZQcU9Ye
Content-Type: text/plain; charset=us-ascii
Content-Description: arm-cpuconf-diff
Content-Disposition: attachment; filename=foo
Index: acorn26/acorn26/cpu.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/acorn26/acorn26/cpu.c,v
retrieving revision 1.2
diff -u -r1.2 cpu.c
--- acorn26/acorn26/cpu.c 2002/03/24 23:37:42 1.2
+++ acorn26/acorn26/cpu.c 2002/04/12 03:13:45
@@ -41,13 +41,12 @@
#include <sys/user.h>
#include <uvm/uvm_extern.h>
#include <arm/armreg.h>
+#include <arm/cpuconf.h>
#include <arm/undefined.h>
#include <machine/machdep.h>
#include <machine/pcb.h>
#include <arch/acorn26/acorn26/cpuvar.h>
-
-#include "opt_cputypes.h"
static int cpu_match(struct device *, struct cfdata *, void *);
static void cpu_attach(struct device *, struct device *, void *);
Index: acorn26/acorn26/except.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/acorn26/acorn26/except.c,v
retrieving revision 1.2
diff -u -r1.2 except.c
--- acorn26/acorn26/except.c 2002/03/24 23:37:42 1.2
+++ acorn26/acorn26/except.c 2002/04/12 03:13:45
@@ -33,7 +33,6 @@
__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include "opt_ktrace.h"
@@ -46,6 +45,7 @@
#include <uvm/uvm_extern.h>
#include <arm/armreg.h>
+#include <arm/cpuconf.h>
#include <machine/intr.h>
#include <machine/machdep.h>
#include <machine/pcb.h>
Index: acorn26/acorn26/locore.S
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/acorn26/acorn26/locore.S,v
retrieving revision 1.2
diff -u -r1.2 locore.S
--- acorn26/acorn26/locore.S 2002/03/24 23:37:42 1.2
+++ acorn26/acorn26/locore.S 2002/04/12 03:13:46
@@ -44,7 +44,8 @@
#include <arm/trap.h>
#include "assym.h"
-#include "opt_cputypes.h"
+#include <arm/cpuconf.h>
+
#include "opt_ddb.h"
#include "fiq.h"
Index: acorn26/acorn26/pmap.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/acorn26/acorn26/pmap.c,v
retrieving revision 1.2
diff -u -r1.2 pmap.c
--- acorn26/acorn26/pmap.c 2002/03/24 23:37:42 1.2
+++ acorn26/acorn26/pmap.c 2002/04/12 03:13:46
@@ -96,7 +96,6 @@
* referenced/modified emulation.
*/
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include "opt_uvmhist.h"
#include "arcvideo.h"
@@ -112,6 +111,8 @@
#include <uvm/uvm_extern.h>
#include <uvm/uvm_stat.h>
+
+#include <arm/cpuconf.h>
#include <machine/intr.h>
#include <machine/machdep.h>
Index: acorn32/acorn32/rpc_machdep.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/acorn32/acorn32/rpc_machdep.c,v
retrieving revision 1.34
diff -u -r1.34 rpc_machdep.c
--- acorn32/acorn32/rpc_machdep.c 2002/04/10 22:30:44 1.34
+++ acorn32/acorn32/rpc_machdep.c 2002/04/12 03:13:47
@@ -47,8 +47,6 @@
* Updated for new bootloader 22/10/00
*/
-
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
#include "vidcvideo.h"
@@ -80,6 +78,7 @@
#include <machine/cpu.h>
#include <machine/io.h>
#include <machine/intr.h>
+#include <arm/cpuconf.h>
#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <machine/vconsole.h>
Index: arm/arm/cpufunc.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/arm/cpufunc.c,v
retrieving revision 1.40
diff -u -r1.40 cpufunc.c
--- arm/arm/cpufunc.c 2002/04/09 21:00:42 1.40
+++ arm/arm/cpufunc.c 2002/04/12 03:13:49
@@ -46,7 +46,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_cputypes.h"
#include "opt_cpuoptions.h"
#include <sys/types.h>
@@ -58,6 +57,7 @@
#include <uvm/uvm.h>
+#include <arm/cpuconf.h>
#include <arm/cpufunc.h>
#ifdef CPU_XSCALE_80200
Index: arm/arm/fiq_subr.S
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/arm/fiq_subr.S,v
retrieving revision 1.2
diff -u -r1.2 fiq_subr.S
--- arm/arm/fiq_subr.S 2002/01/01 16:24:33 1.2
+++ arm/arm/fiq_subr.S 2002/04/12 03:13:49
@@ -36,10 +36,10 @@
*/
#include "assym.h"
-#include "opt_cputypes.h"
#include <arm/armreg.h>
#include <arm/asm.h>
+#include <arm/cpuconf.h>
/*
* MODE_CHANGE_NOP should be inserted between a mode change and a
Index: arm/arm/undefined.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/arm/undefined.c,v
retrieving revision 1.13
diff -u -r1.13 undefined.c
--- arm/arm/undefined.c 2002/03/24 15:49:39 1.13
+++ arm/arm/undefined.c 2002/04/12 03:13:49
@@ -46,7 +46,6 @@
#define FAST_FPE
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include <sys/param.h>
Index: arm/arm32/cpu.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/arm32/cpu.c,v
retrieving revision 1.32
diff -u -r1.32 cpu.c
--- arm/arm32/cpu.c 2002/03/27 01:34:48 1.32
+++ arm/arm32/cpu.c 2002/04/12 03:13:50
@@ -42,7 +42,6 @@
*/
#include "opt_armfpe.h"
-#include "opt_cputypes.h"
#include <sys/param.h>
@@ -55,6 +54,8 @@
#include <uvm/uvm_extern.h>
#include <machine/conf.h>
#include <machine/cpu.h>
+
+#include <arm/cpuconf.h>
#include <arm/undefined.h>
#ifdef ARMFPE
Index: arm/arm32/fault.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/arm32/fault.c,v
retrieving revision 1.17
diff -u -r1.17 fault.c
--- arm/arm32/fault.c 2002/04/04 12:39:55 1.17
+++ arm/arm32/fault.c 2002/04/12 03:13:50
@@ -43,7 +43,6 @@
* Created : 28/11/94
*/
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -55,6 +54,8 @@
#include <sys/kernel.h>
#include <uvm/uvm_extern.h>
+
+#include <arm/cpuconf.h>
#include <machine/frame.h>
#include <arm/arm32/katelib.h>
Index: arm/conf/files.arm
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/conf/files.arm,v
retrieving revision 1.56
diff -u -r1.56 files.arm
--- arm/conf/files.arm 2002/03/26 19:29:45 1.56
+++ arm/conf/files.arm 2002/04/12 03:13:50
@@ -3,7 +3,7 @@
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
-# CPU types
+# CPU types. Make sure to update <arm/cpuconf.h> if you change this list.
defflag opt_cputypes.h CPU_ARM2 CPU_ARM250 CPU_ARM3
defflag opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
CPU_ARM9 CPU_SA110 CPU_SA1100 CPU_SA1110
Index: arm/footbridge/footbridge.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/footbridge/footbridge.c,v
retrieving revision 1.4
diff -u -r1.4 footbridge.c
--- arm/footbridge/footbridge.c 2002/01/05 22:41:47 1.4
+++ arm/footbridge/footbridge.c 2002/04/12 03:13:51
@@ -34,8 +34,6 @@
* SUCH DAMAGE.
*/
-#include "opt_cputypes.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -48,6 +46,7 @@
#include <machine/bus.h>
#include <machine/intr.h>
+#include <arm/cpuconf.h>
#include <arm/cpufunc.h>
#include <arm/footbridge/footbridgevar.h>
Index: arm/include/Makefile
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/include/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- arm/include/Makefile 2002/01/13 15:03:06 1.24
+++ arm/include/Makefile 2002/04/12 03:13:51
@@ -5,7 +5,7 @@
INCS= ansi.h aout_machdep.h armreg.h asm.h \
bswap.h bus.h \
- cdefs.h cpu.h \
+ cdefs.h cpu.h cpuconf.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fp.h frame.h \
Index: arm/include/cpu.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/include/cpu.h,v
retrieving revision 1.25
diff -u -r1.25 cpu.h
--- arm/include/cpu.h 2002/04/03 23:33:30 1.25
+++ arm/include/cpu.h 2002/04/12 03:13:51
@@ -74,10 +74,10 @@
*/
#ifndef _LKM
-#include "opt_cputypes.h"
#include "opt_lockdebug.h"
#endif /* !_LKM */
+#include <arm/cpuconf.h>
#include <machine/intr.h>
#ifndef _LOCORE
Index: arm/include/cpuconf.h
===================================================================
RCS file: cpuconf.h
diff -N cpuconf.h
--- /dev/null Fri Apr 12 06:13:12 2002
+++ cpuconf.h Fri Apr 12 06:13:51 2002
@@ -0,0 +1,129 @@
+/* $NetBSD$ */
+
+/*
+ * Copyright (c 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_CPUCONF_H_
+#define _ARM_CPUCONF_H_
+
+#if defined(_KERNEL_OPT)
+#include "opt_cputypes.h"
+#endif /* _KERNEL_OPT */
+
+/*
+ * Step 1: Count the number of CPU types configured into the kernel.
+ */
+#if defined(_KERNEL_OPT)
+#define CPU_NTYPES (defined(CPU_ARM2) + defined(CPU_ARM250) + \
+ defined(CPU_ARM3) + \
+ defined(CPU_ARM6) + defined(CPU_ARM7) + \
+ defined(CPU_ARM7TDMI) + \
+ defined(CPU_ARM8) + defined(CPU_ARM9) + \
+ defined(CPU_SA110) + defined(CPU_SA1100) + \
+ defined(CPU_SA1110) + \
+ defined(CPU_XSCALE_80200) + \
+ defined(CPU_XSCALE_80321))
+#else
+#define CPU_NTYPES 2
+#endif /* _KERNEL_OPT */
+
+/*
+ * Step 2: Determine which ARM architecture versions are configured.
+ */
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
+#define ARM_ARCH_2 1
+#else
+#define ARM_ARCH_2 0
+#endif
+
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_ARM6) || defined(CPU_ARM7))
+#define ARM_ARCH_3 1
+#else
+#define ARM_ARCH_3 0
+#endif
+
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \
+ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110))
+#define ARM_ARCH_4 1
+#else
+#define ARM_ARCH_4 0
+#endif
+
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
+#define ARM_ARCH_5 1
+#else
+#define ARM_ARCH_5 0
+#endif
+
+#define ARM_NARCH (ARM_ARCH_2 + ARM_ARCH_3 + ARM_ARCH_4 + ARM_ARCH_5)
+#if ARM_NARCH == 0
+#error ARM_NARCH is 0
+#endif
+
+/*
+ * Step 3: Define which MMU classes are configured:
+ *
+ * ARM_MMU_GENERIC Generic ARM MMU, compatible with ARM6.
+ *
+ * ARM_MMU_XSCALE XScale MMU. Compatible with generic ARM
+ * MMU, but also has several extensions which
+ * require different PTE layout to use.
+ */
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \
+ defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_SA110) || \
+ defined(CPU_SA1100) || defined(CPU_SA1110))
+#define ARM_MMU_GENERIC 1
+#else
+#define ARM_MMU_GENERIC 0
+#endif
+
+#if !defined(_KERNEL_OPT) || \
+ (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
+#define ARM_MMU_XSCALE 1
+#else
+#define ARM_MMU_XSCALE 0
+#endif
+
+#define ARM_NMMUS (ARM_MMU_GENERIC + ARM_MMU_XSCALE)
+#if ARM_NMMUS == 0
+#error ARM_NMMUS is 0
+#endif
+
+#endif /* _ARM_CPUCONF_H_ */
Index: arm/include/cpufunc.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/include/cpufunc.h,v
retrieving revision 1.20
diff -u -r1.20 cpufunc.h
--- arm/include/cpufunc.h 2002/04/09 23:44:02 1.20
+++ arm/include/cpufunc.h 2002/04/12 03:13:51
@@ -42,12 +42,10 @@
#ifndef _ARM32_CPUFUNC_H_
#define _ARM32_CPUFUNC_H_
-#include <sys/types.h>
-
#ifdef _KERNEL
-#ifndef _LKM
-#include "opt_cputypes.h"
-#endif
+
+#include <sys/types.h>
+#include <arm/cpuconf.h>
struct cpu_functions {
Index: arm/include/arm32/pmap.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/include/arm32/pmap.h,v
retrieving revision 1.51
diff -u -r1.51 pmap.h
--- arm/include/arm32/pmap.h 2002/04/10 00:45:43 1.51
+++ arm/include/arm32/pmap.h 2002/04/12 03:13:52
@@ -70,6 +70,7 @@
#ifdef _KERNEL
+#include <arm/cpuconf.h>
#include <arm/cpufunc.h>
#include <arm/arm32/pte.h>
#include <uvm/uvm_object.h>
@@ -256,21 +257,7 @@
/************************* ARM MMU configuration *****************************/
-/*
- * We define several classes of ARM MMU, here:
- *
- * ARM_MMU_GENERIC Generic ARM MMU, compatible with ARM6.
- *
- * ARM_MMU_XSCALE XScale MMU. Compatible with generic ARM
- * MMU, but also has several extensions which
- * require different PTE layout to use.
- */
-
-#if defined(_LKM) || defined(CPU_ARM6) || defined(CPU_ARM7) || \
- defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \
- defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110)
-#define ARM_MMU_GENERIC 1
-
+#if ARM_MMU_GENERIC == 1
void pmap_copy_page_generic(paddr_t, paddr_t);
void pmap_zero_page_generic(paddr_t);
@@ -278,13 +265,9 @@
#if defined(CPU_ARM9)
void pmap_pte_init_arm9(void);
#endif /* CPU_ARM9 */
-#else
-#define ARM_MMU_GENERIC 0
-#endif
-
-#if defined(_LKM) || defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321)
-#define ARM_MMU_XSCALE 1
+#endif /* ARM_MMU_GENERIC == 1 */
+#if ARM_MMU_XSCALE == 1
void pmap_copy_page_xscale(paddr_t, paddr_t);
void pmap_zero_page_xscale(paddr_t);
@@ -294,14 +277,7 @@
#endif /* CPU_XSCALE_80200 */
void xscale_setup_minidata(vaddr_t, vaddr_t, paddr_t);
-#else
-#define ARM_MMU_XSCALE 0
-#endif
-
-#define ARM_NMMUS (ARM_MMU_GENERIC + ARM_MMU_XSCALE)
-#if ARM_NMMUS == 0
-#error ARM_NMMUS is 0
-#endif
+#endif /* ARM_MMU_XSCALE == 1 */
extern pt_entry_t pte_l1_s_cache_mode;
extern pt_entry_t pte_l1_s_cache_mask;
Index: arm/sa11x0/sa11x0_irq.S
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/sa11x0/sa11x0_irq.S,v
retrieving revision 1.1
diff -u -r1.1 sa11x0_irq.S
--- arm/sa11x0/sa11x0_irq.S 2001/07/08 23:37:53 1.1
+++ arm/sa11x0/sa11x0_irq.S 2002/04/12 03:13:52
@@ -37,7 +37,6 @@
* SUCH DAMAGE.
*/
-#include "opt_cputypes.h"
#include "opt_irqstats.h"
#include "assym.h"
Index: arm/sa11x0/sa11x0_irqhandler.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/sa11x0/sa11x0_irqhandler.c,v
retrieving revision 1.1
diff -u -r1.1 sa11x0_irqhandler.c
--- arm/sa11x0/sa11x0_irqhandler.c 2001/07/08 23:37:53 1.1
+++ arm/sa11x0/sa11x0_irqhandler.c 2002/04/12 03:13:52
@@ -79,7 +79,6 @@
*/
-#include "opt_cputypes.h"
#include "opt_irqstats.h"
#include <sys/param.h>
Index: cats/include/irqhandler.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/cats/include/irqhandler.h,v
retrieving revision 1.3
diff -u -r1.3 irqhandler.h
--- cats/include/irqhandler.h 2002/02/20 22:32:10 1.3
+++ cats/include/irqhandler.h 2002/04/12 03:13:53
@@ -43,10 +43,6 @@
#ifndef _ARM32_IRQHANDLER_H_
#define _ARM32_IRQHANDLER_H_
-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
#ifndef _LOCORE
#include <sys/types.h>
#endif /* _LOCORE */
Index: evbarm/ifpga/ifpga.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/evbarm/ifpga/ifpga.c,v
retrieving revision 1.6
diff -u -r1.6 ifpga.c
--- evbarm/ifpga/ifpga.c 2002/01/30 03:59:41 1.6
+++ evbarm/ifpga/ifpga.c 2002/04/12 03:13:54
@@ -52,7 +52,6 @@
#include <arm/cpufunc.h>
-#include "opt_cputypes.h"
#include "opt_pci.h"
#include "pci.h"
Index: evbarm/ifpga/irqhandler.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/evbarm/ifpga/irqhandler.h,v
retrieving revision 1.1
diff -u -r1.1 irqhandler.h
--- evbarm/ifpga/irqhandler.h 2002/01/30 03:59:41 1.1
+++ evbarm/ifpga/irqhandler.h 2002/04/12 03:13:55
@@ -50,10 +50,6 @@
#ifndef _ARM32_IRQHANDLER_H_
#define _ARM32_IRQHANDLER_H_
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_cputypes.h"
-#endif
-
#ifndef _LOCORE
#include <sys/types.h>
#endif /* _LOCORE */
Index: hpcarm/hpcarm/hpc_machdep.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hpcarm/hpcarm/hpc_machdep.c,v
retrieving revision 1.45
diff -u -r1.45 hpc_machdep.c
--- hpcarm/hpcarm/hpc_machdep.c 2002/04/09 22:37:03 1.45
+++ hpcarm/hpcarm/hpc_machdep.c 2002/04/12 03:13:56
@@ -48,7 +48,6 @@
* hpc_machdep.c
*/
-#include "opt_cputypes.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -83,6 +82,7 @@
#include <machine/intr.h>
#include <arm/arm32/katelib.h>
#include <machine/bootinfo.h>
+#include <arm/cpuconf.h>
#include <arm/undefined.h>
#include <machine/rtc.h>
#include <machine/platid.h>
Index: hpcarm/include/irqhandler.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hpcarm/include/irqhandler.h,v
retrieving revision 1.4
diff -u -r1.4 irqhandler.h
--- hpcarm/include/irqhandler.h 2001/12/20 01:20:29 1.4
+++ hpcarm/include/irqhandler.h 2002/04/12 03:13:56
@@ -43,10 +43,6 @@
#ifndef _HPCARM_IRQHANDLER_H_
#define _HPCARM_IRQHANDLER_H_
-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
#ifndef _LOCORE
#include <sys/types.h>
#endif /* _LOCORE */
Index: hpcarm/sa11x0/sa11x0_irq.S
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hpcarm/sa11x0/sa11x0_irq.S,v
retrieving revision 1.6
diff -u -r1.6 sa11x0_irq.S
--- hpcarm/sa11x0/sa11x0_irq.S 2001/05/22 17:01:17 1.6
+++ hpcarm/sa11x0/sa11x0_irq.S 2002/04/12 03:13:56
@@ -37,7 +37,6 @@
* SUCH DAMAGE.
*/
-#include "opt_cputypes.h"
#include "opt_irqstats.h"
#include "assym.h"
Index: hpcarm/sa11x0/sa11x0_irqhandler.c
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hpcarm/sa11x0/sa11x0_irqhandler.c,v
retrieving revision 1.7
diff -u -r1.7 sa11x0_irqhandler.c
--- hpcarm/sa11x0/sa11x0_irqhandler.c 2001/06/20 02:18:06 1.7
+++ hpcarm/sa11x0/sa11x0_irqhandler.c 2002/04/12 03:13:57
@@ -78,8 +78,6 @@
* @(#)isa.c 7.2 (Berkeley) 5/13/91
*/
-
-#include "opt_cputypes.h"
#include "opt_irqstats.h"
#include <sys/param.h>
Index: netwinder/include/irqhandler.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/netwinder/include/irqhandler.h,v
retrieving revision 1.4
diff -u -r1.4 irqhandler.h
--- netwinder/include/irqhandler.h 2002/04/10 22:35:17 1.4
+++ netwinder/include/irqhandler.h 2002/04/12 03:13:57
@@ -43,10 +43,6 @@
#ifndef _ARM32_IRQHANDLER_H_
#define _ARM32_IRQHANDLER_H_
-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
#ifndef _LOCORE
#include <sys/types.h>
#endif /* _LOCORE */
--tsOsTdHNUZQcU9Ye--