[ARM] Cleanup ARM includes

arch/arm/kernel/entry-armv.S has contained a comment suggesting that asm/hardware.h and asm/arch/irqs.h should be moved into the asm/arch/entry-macro.S include. So move the includes to these two files as required. Add missing includes (asm/hardware.h, asm/io.h) to asm/arch/system.h includes which use those facilities, and remove asm/io.h from kernel/process.c. Remove other unnecessary includes from arch/arm/kernel, arch/arm/mm and arch/arm/mach-footbridge. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2006-01-03 17:39:34 +00:00 · 2006-01-03 17:39:34 +00:00 · 78ff18a412
parent 9d4f13e531
commit 78ff18a412
28 changed files with 31 additions and 22 deletions
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@ -12,8 +12,6 @@
 *  DMA facilities.
 */
 #include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/mman.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@ -18,8 +18,6 @@
 #include <asm/memory.h>
 #include <asm/glue.h>
 #include <asm/vfpmacros.h>
-#include <asm/hardware.h>		/* should be moved into entry-macro.S */
-#include <asm/arch/irqs.h>		/* should be moved into entry-macro.S */
 #include <asm/arch/entry-macro.S>

 #include "entry-header.S"
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@ -28,10 +28,9 @@
 #include <linux/init.h>
 #include <linux/cpu.h>

-#include <asm/system.h>
-#include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/processor.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/mach/time.h>

--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@ -26,8 +26,6 @@

 #include <asm/cpu.h>
 #include <asm/elf.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
 #include <asm/procinfo.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@ -29,9 +29,6 @@
 #include <linux/sysdev.h>
 #include <linux/timer.h>

-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/leds.h>
 #include <asm/thread_info.h>
 #include <asm/mach/time.h>
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@ -23,7 +23,6 @@

 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
-#include <asm/io.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- a/arch/arm/mach-footbridge/dma.c
+++ b/arch/arm/mach-footbridge/dma.c
@ -15,6 +15,7 @@

 #include <asm/dma.h>
 #include <asm/io.h>
+#include <asm/scatterlist.h>

 #include <asm/mach/dma.h>
 #include <asm/hardware/dec21285.h>
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@ -19,7 +19,6 @@
 #include <linux/dma-mapping.h>

 #include <asm/cacheflush.h>
-#include <asm/io.h>
 #include <asm/tlbflush.h>

 #define CONSISTENT_BASE	(0xffc00000)
--- a/arch/arm/mm/discontig.c
+++ b/arch/arm/mm/discontig.c
@ -9,10 +9,8 @@
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
-
 #include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/init.h>
+#include <linux/mmzone.h>
 #include <linux/bootmem.h>

 #if MAX_NUMNODES != 4 && MAX_NUMNODES != 16
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@ -19,7 +19,6 @@

 #include <asm/pgalloc.h>
 #include <asm/page.h>
-#include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/tlbflush.h>

--- a/include/asm-arm/arch-cl7500/entry-macro.S
+++ b/include/asm-arm/arch-cl7500/entry-macro.S
@ -1,3 +1,3 @@
-
+#include <asm/hardware.h>
 #include <asm/hardware/entry-macro-iomd.S>

--- a/include/asm-arm/arch-clps711x/entry-macro.S
+++ b/include/asm-arm/arch-clps711x/entry-macro.S
@ -7,6 +7,7 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
 #include <asm/hardware/clps7111.h>

 		.macro	disable_fiq
--- a/include/asm-arm/arch-clps711x/system.h
+++ b/include/asm-arm/arch-clps711x/system.h
@ -20,7 +20,9 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H

+#include <asm/hardware.h>
 #include <asm/hardware/clps7111.h>
+#include <asm/io.h>

 static inline void arch_idle(void)
 {
--- a/include/asm-arm/arch-ebsa285/entry-macro.S
+++ b/include/asm-arm/arch-ebsa285/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>
 #include <asm/hardware/dec21285.h>

 		.macro	disable_fiq
--- a/include/asm-arm/arch-imx/entry-macro.S
+++ b/include/asm-arm/arch-imx/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+
 		.macro	disable_fiq
 		.endm
 #define AITC_NIVECSR   0x40
--- a/include/asm-arm/arch-integrator/entry-macro.S
+++ b/include/asm-arm/arch-integrator/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>

 		.macro	disable_fiq
 		.endm
--- a/include/asm-arm/arch-iop3xx/entry-macro.S
+++ b/include/asm-arm/arch-iop3xx/entry-macro.S
@ -7,6 +7,7 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/arch/irqs.h>

 #if defined(CONFIG_ARCH_IOP321)
 		.macro  disable_fiq
--- a/include/asm-arm/arch-ixp2000/entry-macro.S
+++ b/include/asm-arm/arch-ixp2000/entry-macro.S
@ -7,6 +7,7 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/arch/irqs.h>

 		.macro  disable_fiq
 		.endm
--- a/include/asm-arm/arch-ixp4xx/entry-macro.S
+++ b/include/asm-arm/arch-ixp4xx/entry-macro.S
@ -7,6 +7,7 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>

 		.macro	disable_fiq
 		.endm
--- a/include/asm-arm/arch-l7200/system.h
+++ b/include/asm-arm/arch-l7200/system.h
@ -12,6 +12,8 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H

+#include <asm/hardware.h>
+
 static inline void arch_idle(void)
 {
 	*(unsigned long *)(IO_BASE + 0x50004) = 1;	/* idle mode */
--- a/include/asm-arm/arch-lh7a40x/entry-macro.S
+++ b/include/asm-arm/arch-lh7a40x/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>

 # if defined (CONFIG_ARCH_LH7A400) && defined (CONFIG_ARCH_LH7A404)
 #  error "LH7A400 and LH7A404 are mutually exclusive"
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>

 #if defined(CONFIG_ARCH_OMAP1)

--- a/include/asm-arm/arch-pxa/entry-macro.S
+++ b/include/asm-arm/arch-pxa/entry-macro.S
@ -7,6 +7,8 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>

 		.macro	disable_fiq
 		.endm
--- a/include/asm-arm/arch-realview/entry-macro.S
+++ b/include/asm-arm/arch-realview/entry-macro.S
@ -7,7 +7,7 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
-
+#include <asm/hardware.h>
 #include <asm/hardware/gic.h>

 		.macro	disable_fiq
--- a/include/asm-arm/arch-rpc/entry-macro.S
+++ b/include/asm-arm/arch-rpc/entry-macro.S
@ -1,3 +1,3 @@
-
+#include <asm/hardware.h>
 #include <asm/hardware/entry-macro-iomd.S>

--- a/include/asm-arm/arch-s3c2410/entry-macro.S
+++ b/include/asm-arm/arch-s3c2410/entry-macro.S
@ -10,6 +10,8 @@
 * Modifications:
 *     10-Mar-2005 LCVR  Changed S3C2410_VA to S3C24XX_VA
 */
+#include <asm/hardware.h>
+#include <asm/arch/irqs.h>


 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
--- a/include/asm-arm/arch-versatile/entry-macro.S
+++ b/include/asm-arm/arch-versatile/entry-macro.S
@ -7,7 +7,9 @@
 * License version 2. This program is licensed "as is" without any
 * warranty of any kind, whether express or implied.
 */
-			.macro	disable_fiq
+#include <asm/hardware.h>
+
+		.macro	disable_fiq
 		.endm

 		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@ -14,7 +14,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>

-#include <asm/mman.h>
 #include <asm/glue.h>
 #include <asm/shmparam.h>