diff options
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/elf.h | 3 | ||||
-rw-r--r-- | include/asm-arm/page.h | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index ec1c685562c..4ca75162748 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h | |||
@@ -41,7 +41,6 @@ typedef struct user_fp elf_fpregset_t; | |||
41 | #endif | 41 | #endif |
42 | #define ELF_ARCH EM_ARM | 42 | #define ELF_ARCH EM_ARM |
43 | 43 | ||
44 | #ifdef __KERNEL__ | ||
45 | #ifndef __ASSEMBLY__ | 44 | #ifndef __ASSEMBLY__ |
46 | /* | 45 | /* |
47 | * This yields a string that ld.so will use to load implementation | 46 | * This yields a string that ld.so will use to load implementation |
@@ -115,5 +114,3 @@ extern char elf_platform[]; | |||
115 | } while (0) | 114 | } while (0) |
116 | 115 | ||
117 | #endif | 116 | #endif |
118 | |||
119 | #endif | ||
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 7e85db77d99..31ff12f4ffb 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
@@ -10,9 +10,6 @@ | |||
10 | #ifndef _ASMARM_PAGE_H | 10 | #ifndef _ASMARM_PAGE_H |
11 | #define _ASMARM_PAGE_H | 11 | #define _ASMARM_PAGE_H |
12 | 12 | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | |||
16 | /* PAGE_SHIFT determines the page size */ | 13 | /* PAGE_SHIFT determines the page size */ |
17 | #define PAGE_SHIFT 12 | 14 | #define PAGE_SHIFT 12 |
18 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 15 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
@@ -192,6 +189,4 @@ typedef unsigned long pgprot_t; | |||
192 | 189 | ||
193 | #include <asm-generic/page.h> | 190 | #include <asm-generic/page.h> |
194 | 191 | ||
195 | #endif /* __KERNEL__ */ | ||
196 | |||
197 | #endif | 192 | #endif |