diff options
| author | Chris Zankel <chris@zankel.net> | 2010-05-02 01:05:13 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2010-05-02 01:05:13 -0700 |
| commit | 4573e398d591a2fe6c600908578fd31401746529 (patch) | |
| tree | f74ae1023b753cc0ca986af1a3d79535858a8821 /arch/xtensa | |
| parent | cf1c0aaf816ecc90106d997c0af3f7cdde6c2a71 (diff) | |
| download | lwn-4573e398d591a2fe6c600908578fd31401746529.tar.gz lwn-4573e398d591a2fe6c600908578fd31401746529.zip | |
xtensa: Shuffle include statements to fix linker script
The linker script was including assembly macros from the coprocessor
header file that is not otherwise used by the script.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/include/asm/elf.h | 1 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/pgalloc.h | 1 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/processor.h | 1 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/ptrace.h | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/asm-offsets.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/kernel/entry.S | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/elf.h b/arch/xtensa/include/asm/elf.h index 5eb6d695e987..6e65eadaae14 100644 --- a/arch/xtensa/include/asm/elf.h +++ b/arch/xtensa/include/asm/elf.h @@ -14,6 +14,7 @@ #define _XTENSA_ELF_H #include <asm/ptrace.h> +#include <asm/coprocessor.h> /* Xtensa processor ELF architecture-magic number */ diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h index 4f4a7987eded..40cf9bceda2c 100644 --- a/arch/xtensa/include/asm/pgalloc.h +++ b/arch/xtensa/include/asm/pgalloc.h @@ -14,6 +14,7 @@ #ifdef __KERNEL__ #include <linux/highmem.h> +#include <linux/slab.h> /* * Allocating and freeing a pmd is trivial: the 1-entry pmd is diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index 0ea4937c0b61..3acb26e8dead 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -12,7 +12,6 @@ #define _XTENSA_PROCESSOR_H #include <variant/core.h> -#include <asm/coprocessor.h> #include <platform/hardware.h> #include <linux/compiler.h> diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h index 3c549f798727..0d42c934b66f 100644 --- a/arch/xtensa/include/asm/ptrace.h +++ b/arch/xtensa/include/asm/ptrace.h @@ -77,6 +77,8 @@ #ifndef __ASSEMBLY__ +#include <asm/coprocessor.h> + /* * This struct defines the way the registers are stored on the * kernel stack during a system call or other kernel entry. diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c index 070ff8af3a21..7dc3f9157185 100644 --- a/arch/xtensa/kernel/asm-offsets.c +++ b/arch/xtensa/kernel/asm-offsets.c @@ -13,6 +13,7 @@ */ #include <asm/processor.h> +#include <asm/coprocessor.h> #include <linux/types.h> #include <linux/stddef.h> diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index 77fc9f6dc016..5fd01f6aaf37 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -16,6 +16,7 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/processor.h> +#include <asm/coprocessor.h> #include <asm/thread_info.h> #include <asm/uaccess.h> #include <asm/unistd.h> |