xtensa: Shuffle include statements to fix linker script

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Chris Zankel 16 years ago 4573e398 cf1c0aaf

+6 -1

6 changed files

expand all

arch

xtensa

include

asm

elf.h

pgalloc.h

processor.h

ptrace.h

kernel

asm-offsets.c

entry.S

arch/xtensa/include/asm/elf.h

··· 14 14 #define _XTENSA_ELF_H 15 15 16 16 #include <asm/ptrace.h> 17 + #include <asm/coprocessor.h> 17 18 18 19 /* Xtensa processor ELF architecture-magic number */ 19 20

arch/xtensa/include/asm/pgalloc.h

··· 14 14 #ifdef __KERNEL__ 15 15 16 16 #include <linux/highmem.h> 17 + #include <linux/slab.h> 17 18 18 19 /* 19 20 * Allocating and freeing a pmd is trivial: the 1-entry pmd is

-1

arch/xtensa/include/asm/processor.h

··· 12 12 #define _XTENSA_PROCESSOR_H 13 13 14 14 #include <variant/core.h> 15 - #include <asm/coprocessor.h> 16 15 #include <platform/hardware.h> 17 16 18 17 #include <linux/compiler.h>

arch/xtensa/include/asm/ptrace.h

··· 77 77 78 78 #ifndef __ASSEMBLY__ 79 79 80 + #include <asm/coprocessor.h> 81 + 80 82 /* 81 83 * This struct defines the way the registers are stored on the 82 84 * kernel stack during a system call or other kernel entry.

arch/xtensa/kernel/asm-offsets.c

··· 13 13 */ 14 14 15 15 #include <asm/processor.h> 16 + #include <asm/coprocessor.h> 16 17 17 18 #include <linux/types.h> 18 19 #include <linux/stddef.h>

arch/xtensa/kernel/entry.S

··· 16 16 #include <linux/linkage.h> 17 17 #include <asm/asm-offsets.h> 18 18 #include <asm/processor.h> 19 + #include <asm/coprocessor.h> 19 20 #include <asm/thread_info.h> 20 21 #include <asm/uaccess.h> 21 22 #include <asm/unistd.h>