Commit 78ff18a4 authored by Russell King's avatar Russell King Committed by Russell King

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9d4f13e5
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
* DMA facilities. * DMA facilities.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h>
#include <linux/mman.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/errno.h> #include <linux/errno.h>
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/glue.h> #include <asm/glue.h>
#include <asm/vfpmacros.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 <asm/arch/entry-macro.S>
#include "entry-header.S" #include "entry-header.S"
......
...@@ -28,10 +28,9 @@ ...@@ -28,10 +28,9 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/leds.h> #include <asm/leds.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/elf.h> #include <asm/elf.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/leds.h> #include <asm/leds.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/unistd.h> #include <asm/unistd.h>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/scatterlist.h>
#include <asm/mach/dma.h> #include <asm/mach/dma.h>
#include <asm/hardware/dec21285.h> #include <asm/hardware/dec21285.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/io.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#define CONSISTENT_BASE (0xffc00000) #define CONSISTENT_BASE (0xffc00000)
......
...@@ -9,10 +9,8 @@ ...@@ -9,10 +9,8 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mm.h> #include <linux/mmzone.h>
#include <linux/init.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#if MAX_NUMNODES != 4 && MAX_NUMNODES != 16 #if MAX_NUMNODES != 4 && MAX_NUMNODES != 16
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
......
#include <asm/hardware.h>
#include <asm/hardware/entry-macro-iomd.S> #include <asm/hardware/entry-macro-iomd.S>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/hardware/clps7111.h> #include <asm/hardware/clps7111.h>
.macro disable_fiq .macro disable_fiq
......
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
#include <asm/hardware.h>
#include <asm/hardware/clps7111.h> #include <asm/hardware/clps7111.h>
#include <asm/io.h>
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/arch/irqs.h>
#include <asm/hardware/dec21285.h> #include <asm/hardware/dec21285.h>
.macro disable_fiq .macro disable_fiq
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
.macro disable_fiq .macro disable_fiq
.endm .endm
#define AITC_NIVECSR 0x40 #define AITC_NIVECSR 0x40
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/arch/irqs.h>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/arch/irqs.h>
#if defined(CONFIG_ARCH_IOP321) #if defined(CONFIG_ARCH_IOP321)
.macro disable_fiq .macro disable_fiq
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/arch/irqs.h>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
#include <asm/hardware.h>
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
*(unsigned long *)(IO_BASE + 0x50004) = 1; /* idle mode */ *(unsigned long *)(IO_BASE + 0x50004) = 1; /* idle mode */
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * 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) # if defined (CONFIG_ARCH_LH7A400) && defined (CONFIG_ARCH_LH7A404)
# error "LH7A400 and LH7A404 are mutually exclusive" # error "LH7A400 and LH7A404 are mutually exclusive"
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/arch/irqs.h>
#if defined(CONFIG_ARCH_OMAP1) #if defined(CONFIG_ARCH_OMAP1)
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/arch/irqs.h>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <asm/hardware.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
.macro disable_fiq .macro disable_fiq
......
#include <asm/hardware.h>
#include <asm/hardware/entry-macro-iomd.S> #include <asm/hardware/entry-macro-iomd.S>
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
* Modifications: * Modifications:
* 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA * 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 .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
.macro disable_fiq #include <asm/hardware.h>
.macro disable_fiq
.endm .endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/mman.h>
#include <asm/glue.h> #include <asm/glue.h>
#include <asm/shmparam.h> #include <asm/shmparam.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment