diff options
-rw-r--r-- | include/asm-powerpc/elf.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index 94d228f9c6ac..790a69e473c4 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h | |||
@@ -3,14 +3,14 @@ | |||
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #include <linux/sched.h> /* for task_struct */ | 5 | #include <linux/sched.h> /* for task_struct */ |
6 | #include <asm/page.h> | ||
7 | #include <asm/string.h> | ||
6 | #endif | 8 | #endif |
7 | 9 | ||
8 | #include <asm/types.h> | 10 | #include <asm/types.h> |
9 | #include <asm/ptrace.h> | 11 | #include <asm/ptrace.h> |
10 | #include <asm/cputable.h> | 12 | #include <asm/cputable.h> |
11 | #include <asm/auxvec.h> | 13 | #include <asm/auxvec.h> |
12 | #include <asm/page.h> | ||
13 | #include <asm/string.h> | ||
14 | 14 | ||
15 | /* PowerPC relocations defined by the ABIs */ | 15 | /* PowerPC relocations defined by the ABIs */ |
16 | #define R_PPC_NONE 0 | 16 | #define R_PPC_NONE 0 |
@@ -161,6 +161,7 @@ typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG]; | |||
161 | typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; | 161 | typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | #ifdef __KERNEL__ | ||
164 | /* | 165 | /* |
165 | * This is used to ensure we don't load something for the wrong architecture. | 166 | * This is used to ensure we don't load something for the wrong architecture. |
166 | */ | 167 | */ |
@@ -176,8 +177,6 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; | |||
176 | 177 | ||
177 | #define ELF_ET_DYN_BASE (0x08000000) | 178 | #define ELF_ET_DYN_BASE (0x08000000) |
178 | 179 | ||
179 | #ifdef __KERNEL__ | ||
180 | |||
181 | /* Common routine for both 32-bit and 64-bit processes */ | 180 | /* Common routine for both 32-bit and 64-bit processes */ |
182 | static inline void ppc_elf_core_copy_regs(elf_gregset_t elf_regs, | 181 | static inline void ppc_elf_core_copy_regs(elf_gregset_t elf_regs, |
183 | struct pt_regs *regs) | 182 | struct pt_regs *regs) |