[ARM] Cleanup ARM includes
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 3 Jan 2006 17:39:34 +0000 (17:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 3 Jan 2006 17:39:34 +0000 (17:39 +0000)
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>
28 files changed:
arch/arm/kernel/dma.c
arch/arm/kernel/entry-armv.S
arch/arm/kernel/process.c
arch/arm/kernel/setup.c
arch/arm/kernel/time.c
arch/arm/kernel/traps.c
arch/arm/mach-footbridge/dma.c
arch/arm/mm/consistent.c
arch/arm/mm/discontig.c
arch/arm/mm/mm-armv.c
include/asm-arm/arch-cl7500/entry-macro.S
include/asm-arm/arch-clps711x/entry-macro.S
include/asm-arm/arch-clps711x/system.h
include/asm-arm/arch-ebsa285/entry-macro.S
include/asm-arm/arch-imx/entry-macro.S
include/asm-arm/arch-integrator/entry-macro.S
include/asm-arm/arch-iop3xx/entry-macro.S
include/asm-arm/arch-ixp2000/entry-macro.S
include/asm-arm/arch-ixp4xx/entry-macro.S
include/asm-arm/arch-l7200/system.h
include/asm-arm/arch-lh7a40x/entry-macro.S
include/asm-arm/arch-omap/entry-macro.S
include/asm-arm/arch-pxa/entry-macro.S
include/asm-arm/arch-realview/entry-macro.S
include/asm-arm/arch-rpc/entry-macro.S
include/asm-arm/arch-s3c2410/entry-macro.S
include/asm-arm/arch-versatile/entry-macro.S
include/asm-arm/cacheflush.h

index 2b78838842346da390e8547cd37035184376d506..8d6381cd89153adf628f0387253cf519b0f2e774 100644 (file)
@@ -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>
index 2a8d27e18fa7765c13229cbb91f31a113c1b113d..a52baedf6262f776c2b2be8a474efc5290c0f7c9 100644 (file)
@@ -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"
index 30494aab829a8adeb68a165c168aa6cd8593cf39..54a21bdcba5cde6fe94bc1d56a3e083b5ac68af6 100644 (file)
 #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>
 
index 85774165e9fdbccc1143636b4b484bf72b7cd48c..2cab741ad0f8e2d31cbb9fec2b3fefc8b40a429c 100644 (file)
@@ -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>
index fc4729106a3262cd4709f8f822673952205098c8..d7d932c02866d51336414ecf44f3c98c935abedd 100644 (file)
@@ -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>
index 45e9ea6cd2a50e482c9e2aad0c07c4d916b8e6cf..c9fe6f5f7ee35ac6df900efcf06c85cd908e3a15 100644 (file)
@@ -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>
index a6b1396b0951bbeb021b50c1dc2dd10a302d0753..7a54578b51af5666025cdb679496f3c5492c6a6b 100644 (file)
@@ -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>
index dbfe9e891f015a87f3efb5b31349d8c1baca20c8..0513ed1b2fcf8334ffdcf12a78277008e23e07c8 100644 (file)
@@ -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)
index 0d097bb1bc4d3963df211cae5a07706bb6d3696e..1e56021895072b69777ddebc3d18b54fd2baba0e 100644 (file)
@@ -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
index 9e50127be635c7bbb52c4dc8824524ba4397f6fc..d0245a31d4dd15f8382e0de7087b3027e97acbc7 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <asm/pgalloc.h>
 #include <asm/page.h>
-#include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/tlbflush.h>
 
index 686f413f82d66906555c8843043ffbcecef3a63f..c9e5395e510614a50259c4cd5719d724f4320ad9 100644 (file)
@@ -1,3 +1,3 @@
-
+#include <asm/hardware.h>
 #include <asm/hardware/entry-macro-iomd.S>
 
index b31079a1d4a92d740f36b70ddc59f8f399b1168d..21f6ee4858191bc46f5580f553f834a21e1f7caa 100644 (file)
@@ -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
index 2ab981fee37fa9a0e99c275bc07ecdd30647a649..11e1491535a8a67d86d29ba68f7d6a8dbefac966 100644 (file)
@@ -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)
 {
index db5729ff634932903da1015427f7c88052ef8eb7..cf10ac96fdded85a3a97fd26442c92328942d9b0 100644 (file)
@@ -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
index b40ea7cf88ec9b8222e00af84752bd852f71632a..3b9ef69146275a68929602e67f773b238f676348 100644 (file)
@@ -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
index 44f7ee613194c8d8469e7c57eb8aabf543ade92d..69838d04f90bc9882c36c06ffa65a3b513737021 100644 (file)
@@ -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
index e2ce7f5467c89c8289f6797dece61751180db463..926668c098a5aff5fd46af6029d04d3fe56ac465 100644 (file)
@@ -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
index e3a4e4121298547822ba858ef232bccd9f856c4d..16e1e6124b319bec4e7b043abb3e13c9d126229d 100644 (file)
@@ -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
index 323b0bc4a39c9e74465a72581406a612ccae1678..27e124132e4cde02926eae5b52aeb26cdefbd896 100644 (file)
@@ -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
index cb4ff29059b8a375efe30300f2470fa02c303daa..18825cf071ba6b766751570f2bb47c087cf4e56e 100644 (file)
@@ -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 */
index 865f396aa63cc382b7a54d2c55062caac87afbf3..a2f67c06d9c94281741d5e0f9509367eab92778a 100644 (file)
@@ -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"
index f8814a84910e4025371ef44c6b2ee4fa434dbecd..0ffb1185f1ac90b930fd486e6fe57c85bf0a0bcd 100644 (file)
@@ -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)
 
index 2abfc8bb3ee59be2b6bd98b133e20f3d37937278..4985e33afc12de2cc389dad3e76dc60182345d57 100644 (file)
@@ -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
index 6288fad0dc4182f9ebd4409b443cce684016c28d..1a6eec86bd476581b0e29f5ae566d9a49c61d27b 100644 (file)
@@ -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
index 686f413f82d66906555c8843043ffbcecef3a63f..c9e5395e510614a50259c4cd5719d724f4320ad9 100644 (file)
@@ -1,3 +1,3 @@
-
+#include <asm/hardware.h>
 #include <asm/hardware/entry-macro-iomd.S>
 
index b7d4d7f4422d97dbcc08c47cd383f2a33c6eee3d..cc06b1bd37b245a5f030feb3ef5955f18c2863b0 100644 (file)
@@ -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
index 90e4e970d25304613ca8d2f3e34424ec9ad42882..58f0d71759f6606f342652b8f61702cf7e3a2168 100644 (file)
@@ -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
index e81baff4f54b3293d18290088af1e1ac1f65fabe..09e19a783a51dd9339e5234fae2f65d01484742f 100644 (file)
@@ -14,7 +14,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 
-#include <asm/mman.h>
 #include <asm/glue.h>
 #include <asm/shmparam.h>