diff options
Diffstat (limited to 'include')
45 files changed, 3 insertions, 150 deletions
diff --git a/include/asm-alpha/elf.h b/include/asm-alpha/elf.h index 4b518e3b952c..fc1002ea1e0c 100644 --- a/include/asm-alpha/elf.h +++ b/include/asm-alpha/elf.h | |||
| @@ -144,8 +144,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task); | |||
| 144 | : amask (AMASK_CIX) ? "ev6" : "ev67"); \ | 144 | : amask (AMASK_CIX) ? "ev6" : "ev67"); \ |
| 145 | }) | 145 | }) |
| 146 | 146 | ||
| 147 | #ifdef __KERNEL__ | ||
| 148 | |||
| 149 | #define SET_PERSONALITY(EX, IBCS2) \ | 147 | #define SET_PERSONALITY(EX, IBCS2) \ |
| 150 | set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ | 148 | set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ |
| 151 | ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX) | 149 | ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX) |
| @@ -164,5 +162,4 @@ extern int alpha_l3_cacheshape; | |||
| 164 | NEW_AUX_ENT(AT_L3_CACHESHAPE, alpha_l3_cacheshape); \ | 162 | NEW_AUX_ENT(AT_L3_CACHESHAPE, alpha_l3_cacheshape); \ |
| 165 | } while (0) | 163 | } while (0) |
| 166 | 164 | ||
| 167 | #endif /* __KERNEL__ */ | ||
| 168 | #endif /* __ASM_ALPHA_ELF_H */ | 165 | #endif /* __ASM_ALPHA_ELF_H */ |
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index 8cc97bfd3789..05f09f997d82 100644 --- a/include/asm-alpha/page.h +++ b/include/asm-alpha/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_PAGE_H | 1 | #ifndef _ALPHA_PAGE_H |
| 2 | #define _ALPHA_PAGE_H | 2 | #define _ALPHA_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <linux/const.h> | 4 | #include <linux/const.h> |
| 7 | #include <asm/pal.h> | 5 | #include <asm/pal.h> |
| 8 | 6 | ||
| @@ -98,5 +96,4 @@ typedef unsigned long pgprot_t; | |||
| 98 | #include <asm-generic/memory_model.h> | 96 | #include <asm-generic/memory_model.h> |
| 99 | #include <asm-generic/page.h> | 97 | #include <asm-generic/page.h> |
| 100 | 98 | ||
| 101 | #endif /* __KERNEL__ */ | ||
| 102 | #endif /* _ALPHA_PAGE_H */ | 99 | #endif /* _ALPHA_PAGE_H */ |
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index ec1c685562ce..4ca751627489 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 7e85db77d99b..31ff12f4ffb7 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 |
diff --git a/include/asm-avr32/elf.h b/include/asm-avr32/elf.h index d334b4994d2d..64ce40ee1d58 100644 --- a/include/asm-avr32/elf.h +++ b/include/asm-avr32/elf.h | |||
| @@ -103,8 +103,6 @@ typedef struct user_fpu_struct elf_fpregset_t; | |||
| 103 | 103 | ||
| 104 | #define ELF_PLATFORM (NULL) | 104 | #define ELF_PLATFORM (NULL) |
| 105 | 105 | ||
| 106 | #ifdef __KERNEL__ | ||
| 107 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) | 106 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) |
| 108 | #endif | ||
| 109 | 107 | ||
| 110 | #endif /* __ASM_AVR32_ELF_H */ | 108 | #endif /* __ASM_AVR32_ELF_H */ |
diff --git a/include/asm-avr32/page.h b/include/asm-avr32/page.h index 0f630b3e9932..ee23499cec34 100644 --- a/include/asm-avr32/page.h +++ b/include/asm-avr32/page.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #ifndef __ASM_AVR32_PAGE_H | 8 | #ifndef __ASM_AVR32_PAGE_H |
| 9 | #define __ASM_AVR32_PAGE_H | 9 | #define __ASM_AVR32_PAGE_H |
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | ||
| 12 | |||
| 13 | /* PAGE_SHIFT determines the page size */ | 11 | /* PAGE_SHIFT determines the page size */ |
| 14 | #define PAGE_SHIFT 12 | 12 | #define PAGE_SHIFT 12 |
| 15 | #ifdef __ASSEMBLY__ | 13 | #ifdef __ASSEMBLY__ |
| @@ -107,6 +105,4 @@ static inline int get_order(unsigned long size) | |||
| 107 | */ | 105 | */ |
| 108 | #define HIGHMEM_START 0x20000000UL | 106 | #define HIGHMEM_START 0x20000000UL |
| 109 | 107 | ||
| 110 | #endif /* __KERNEL__ */ | ||
| 111 | |||
| 112 | #endif /* __ASM_AVR32_PAGE_H */ | 108 | #endif /* __ASM_AVR32_PAGE_H */ |
diff --git a/include/asm-blackfin/elf.h b/include/asm-blackfin/elf.h index 5264b5536a70..30303fc8292c 100644 --- a/include/asm-blackfin/elf.h +++ b/include/asm-blackfin/elf.h | |||
| @@ -120,8 +120,6 @@ do { \ | |||
| 120 | 120 | ||
| 121 | #define ELF_PLATFORM (NULL) | 121 | #define ELF_PLATFORM (NULL) |
| 122 | 122 | ||
| 123 | #ifdef __KERNEL__ | ||
| 124 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 123 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 125 | #endif | ||
| 126 | 124 | ||
| 127 | #endif | 125 | #endif |
diff --git a/include/asm-blackfin/page.h b/include/asm-blackfin/page.h index 8bc86717021c..d5c9d1433781 100644 --- a/include/asm-blackfin/page.h +++ b/include/asm-blackfin/page.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #endif | 11 | #endif |
| 12 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 12 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | ||
| 15 | |||
| 16 | #include <asm/setup.h> | 14 | #include <asm/setup.h> |
| 17 | 15 | ||
| 18 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| @@ -88,6 +86,5 @@ extern unsigned long memory_end; | |||
| 88 | #include <asm-generic/page.h> | 86 | #include <asm-generic/page.h> |
| 89 | 87 | ||
| 90 | #endif /* __ASSEMBLY__ */ | 88 | #endif /* __ASSEMBLY__ */ |
| 91 | #endif /* __KERNEL__ */ | ||
| 92 | 89 | ||
| 93 | #endif /* _BLACKFIN_PAGE_H */ | 90 | #endif /* _BLACKFIN_PAGE_H */ |
diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h index 96a40c1de57c..001f64ad11e8 100644 --- a/include/asm-cris/elf.h +++ b/include/asm-cris/elf.h | |||
| @@ -45,7 +45,6 @@ typedef unsigned long elf_fpregset_t; | |||
| 45 | #define ELF_DATA ELFDATA2LSB | 45 | #define ELF_DATA ELFDATA2LSB |
| 46 | #define ELF_ARCH EM_CRIS | 46 | #define ELF_ARCH EM_CRIS |
| 47 | 47 | ||
| 48 | #ifdef __KERNEL__ | ||
| 49 | #include <asm/arch/elf.h> | 48 | #include <asm/arch/elf.h> |
| 50 | 49 | ||
| 51 | /* The master for these definitions is {binutils}/include/elf/cris.h: */ | 50 | /* The master for these definitions is {binutils}/include/elf/cris.h: */ |
| @@ -91,6 +90,4 @@ typedef unsigned long elf_fpregset_t; | |||
| 91 | 90 | ||
| 92 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 91 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 93 | 92 | ||
| 94 | #endif /* __KERNEL__ */ | ||
| 95 | |||
| 96 | #endif | 93 | #endif |
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index b84353ef6998..3b0156c46311 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _CRIS_PAGE_H | 1 | #ifndef _CRIS_PAGE_H |
| 2 | #define _CRIS_PAGE_H | 2 | #define _CRIS_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <asm/arch/page.h> | 4 | #include <asm/arch/page.h> |
| 7 | #include <linux/const.h> | 5 | #include <linux/const.h> |
| 8 | 6 | ||
| @@ -74,7 +72,5 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 74 | #include <asm-generic/memory_model.h> | 72 | #include <asm-generic/memory_model.h> |
| 75 | #include <asm-generic/page.h> | 73 | #include <asm-generic/page.h> |
| 76 | 74 | ||
| 77 | #endif /* __KERNEL__ */ | ||
| 78 | |||
| 79 | #endif /* _CRIS_PAGE_H */ | 75 | #endif /* _CRIS_PAGE_H */ |
| 80 | 76 | ||
diff --git a/include/asm-frv/elf.h b/include/asm-frv/elf.h index 7df58a3e6e4a..9fb946bb7dc9 100644 --- a/include/asm-frv/elf.h +++ b/include/asm-frv/elf.h | |||
| @@ -137,8 +137,6 @@ do { \ | |||
| 137 | 137 | ||
| 138 | #define ELF_PLATFORM (NULL) | 138 | #define ELF_PLATFORM (NULL) |
| 139 | 139 | ||
| 140 | #ifdef __KERNEL__ | ||
| 141 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 140 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 142 | #endif | ||
| 143 | 141 | ||
| 144 | #endif | 142 | #endif |
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h index bd9bd2d9cc78..cacc045700de 100644 --- a/include/asm-frv/page.h +++ b/include/asm-frv/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _ASM_PAGE_H | 1 | #ifndef _ASM_PAGE_H |
| 2 | #define _ASM_PAGE_H | 2 | #define _ASM_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <asm/virtconvert.h> | 4 | #include <asm/virtconvert.h> |
| 7 | #include <asm/mem-layout.h> | 5 | #include <asm/mem-layout.h> |
| 8 | #include <asm/sections.h> | 6 | #include <asm/sections.h> |
| @@ -79,6 +77,4 @@ extern unsigned long max_pfn; | |||
| 79 | #include <asm-generic/memory_model.h> | 77 | #include <asm-generic/memory_model.h> |
| 80 | #include <asm-generic/page.h> | 78 | #include <asm-generic/page.h> |
| 81 | 79 | ||
| 82 | #endif /* __KERNEL__ */ | ||
| 83 | |||
| 84 | #endif /* _ASM_PAGE_H */ | 80 | #endif /* _ASM_PAGE_H */ |
diff --git a/include/asm-h8300/elf.h b/include/asm-h8300/elf.h index 7ba6a0af447c..26bfc7e641da 100644 --- a/include/asm-h8300/elf.h +++ b/include/asm-h8300/elf.h | |||
| @@ -55,9 +55,7 @@ typedef unsigned long elf_fpregset_t; | |||
| 55 | 55 | ||
| 56 | #define ELF_PLATFORM (NULL) | 56 | #define ELF_PLATFORM (NULL) |
| 57 | 57 | ||
| 58 | #ifdef __KERNEL__ | ||
| 59 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) | 58 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) |
| 60 | #endif | ||
| 61 | 59 | ||
| 62 | #define R_H8_NONE 0 | 60 | #define R_H8_NONE 0 |
| 63 | #define R_H8_DIR32 1 | 61 | #define R_H8_DIR32 1 |
diff --git a/include/asm-h8300/page.h b/include/asm-h8300/page.h index c8cc81a3aca5..a83492449130 100644 --- a/include/asm-h8300/page.h +++ b/include/asm-h8300/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _H8300_PAGE_H | 1 | #ifndef _H8300_PAGE_H |
| 2 | #define _H8300_PAGE_H | 2 | #define _H8300_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | /* PAGE_SHIFT determines the page size */ | 4 | /* PAGE_SHIFT determines the page size */ |
| 7 | 5 | ||
| 8 | #define PAGE_SHIFT (12) | 6 | #define PAGE_SHIFT (12) |
| @@ -79,6 +77,4 @@ extern unsigned long memory_end; | |||
| 79 | #include <asm-generic/memory_model.h> | 77 | #include <asm-generic/memory_model.h> |
| 80 | #include <asm-generic/page.h> | 78 | #include <asm-generic/page.h> |
| 81 | 79 | ||
| 82 | #endif /* __KERNEL__ */ | ||
| 83 | |||
| 84 | #endif /* _H8300_PAGE_H */ | 80 | #endif /* _H8300_PAGE_H */ |
diff --git a/include/asm-ia64/elf.h b/include/asm-ia64/elf.h index f10e29b60b00..f8e83eca67a2 100644 --- a/include/asm-ia64/elf.h +++ b/include/asm-ia64/elf.h | |||
| @@ -177,7 +177,6 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst); | |||
| 177 | relevant until we have real hardware to play with... */ | 177 | relevant until we have real hardware to play with... */ |
| 178 | #define ELF_PLATFORM NULL | 178 | #define ELF_PLATFORM NULL |
| 179 | 179 | ||
| 180 | #ifdef __KERNEL__ | ||
| 181 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) | 180 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) |
| 182 | #define elf_read_implies_exec(ex, executable_stack) \ | 181 | #define elf_read_implies_exec(ex, executable_stack) \ |
| 183 | ((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0) | 182 | ((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0) |
| @@ -248,6 +247,4 @@ do { \ | |||
| 248 | } \ | 247 | } \ |
| 249 | } while (0) | 248 | } while (0) |
| 250 | 249 | ||
| 251 | #endif /* __KERNEL__ */ | ||
| 252 | |||
| 253 | #endif /* _ASM_IA64_ELF_H */ | 250 | #endif /* _ASM_IA64_ELF_H */ |
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index d6345464a2b3..8a8aa3fd7cd4 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | * David Mosberger-Tang <davidm@hpl.hp.com> | 7 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | # ifdef __KERNEL__ | ||
| 11 | |||
| 12 | #include <asm/intrinsics.h> | 10 | #include <asm/intrinsics.h> |
| 13 | #include <asm/types.h> | 11 | #include <asm/types.h> |
| 14 | 12 | ||
| @@ -227,5 +225,4 @@ get_order (unsigned long size) | |||
| 227 | (((current->personality & READ_IMPLIES_EXEC) != 0) \ | 225 | (((current->personality & READ_IMPLIES_EXEC) != 0) \ |
| 228 | ? VM_EXEC : 0)) | 226 | ? VM_EXEC : 0)) |
| 229 | 227 | ||
| 230 | # endif /* __KERNEL__ */ | ||
| 231 | #endif /* _ASM_IA64_PAGE_H */ | 228 | #endif /* _ASM_IA64_PAGE_H */ |
diff --git a/include/asm-m32r/elf.h b/include/asm-m32r/elf.h index bbee8b25d175..67bcd77494a5 100644 --- a/include/asm-m32r/elf.h +++ b/include/asm-m32r/elf.h | |||
| @@ -129,8 +129,6 @@ typedef elf_fpreg_t elf_fpregset_t; | |||
| 129 | intent than poking at uname or /proc/cpuinfo. */ | 129 | intent than poking at uname or /proc/cpuinfo. */ |
| 130 | #define ELF_PLATFORM (NULL) | 130 | #define ELF_PLATFORM (NULL) |
| 131 | 131 | ||
| 132 | #ifdef __KERNEL__ | ||
| 133 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) | 132 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) |
| 134 | #endif | ||
| 135 | 133 | ||
| 136 | #endif /* _ASM_M32R__ELF_H */ | 134 | #endif /* _ASM_M32R__ELF_H */ |
diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h index 04fd183a2c58..05d43bbbf940 100644 --- a/include/asm-m32r/page.h +++ b/include/asm-m32r/page.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 6 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
| 7 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 7 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | ||
| 10 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
| 11 | 10 | ||
| 12 | extern void clear_page(void *to); | 11 | extern void clear_page(void *to); |
| @@ -87,5 +86,4 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 87 | #include <asm-generic/memory_model.h> | 86 | #include <asm-generic/memory_model.h> |
| 88 | #include <asm-generic/page.h> | 87 | #include <asm-generic/page.h> |
| 89 | 88 | ||
| 90 | #endif /* __KERNEL__ */ | ||
| 91 | #endif /* _ASM_M32R_PAGE_H */ | 89 | #endif /* _ASM_M32R_PAGE_H */ |
diff --git a/include/asm-m68k/elf.h b/include/asm-m68k/elf.h index eb63b85f9336..14ea42152b97 100644 --- a/include/asm-m68k/elf.h +++ b/include/asm-m68k/elf.h | |||
| @@ -114,8 +114,6 @@ typedef struct user_m68kfp_struct elf_fpregset_t; | |||
| 114 | 114 | ||
| 115 | #define ELF_PLATFORM (NULL) | 115 | #define ELF_PLATFORM (NULL) |
| 116 | 116 | ||
| 117 | #ifdef __KERNEL__ | ||
| 118 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 117 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 119 | #endif | ||
| 120 | 118 | ||
| 121 | #endif | 119 | #endif |
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 1431ea0b59e0..3f29e2a03a43 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | #ifndef _M68K_PAGE_H | 1 | #ifndef _M68K_PAGE_H |
| 2 | #define _M68K_PAGE_H | 2 | #define _M68K_PAGE_H |
| 3 | 3 | ||
| 4 | |||
| 5 | #ifdef __KERNEL__ | ||
| 6 | |||
| 7 | #include <linux/const.h> | 4 | #include <linux/const.h> |
| 8 | 5 | ||
| 9 | /* PAGE_SHIFT determines the page size */ | 6 | /* PAGE_SHIFT determines the page size */ |
| @@ -230,6 +227,4 @@ static inline __attribute_const__ int __virt_to_node_shift(void) | |||
| 230 | 227 | ||
| 231 | #include <asm-generic/page.h> | 228 | #include <asm-generic/page.h> |
| 232 | 229 | ||
| 233 | #endif /* __KERNEL__ */ | ||
| 234 | |||
| 235 | #endif /* _M68K_PAGE_H */ | 230 | #endif /* _M68K_PAGE_H */ |
diff --git a/include/asm-m68knommu/elf.h b/include/asm-m68knommu/elf.h index 40b1ed6827db..27f0ec70fba8 100644 --- a/include/asm-m68knommu/elf.h +++ b/include/asm-m68knommu/elf.h | |||
| @@ -105,8 +105,6 @@ typedef struct user_m68kfp_struct elf_fpregset_t; | |||
| 105 | 105 | ||
| 106 | #define ELF_PLATFORM (NULL) | 106 | #define ELF_PLATFORM (NULL) |
| 107 | 107 | ||
| 108 | #ifdef __KERNEL__ | ||
| 109 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 108 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 110 | #endif | ||
| 111 | 109 | ||
| 112 | #endif | 110 | #endif |
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h index 9efa0a9851b1..6af480c7f291 100644 --- a/include/asm-m68knommu/page.h +++ b/include/asm-m68knommu/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _M68KNOMMU_PAGE_H | 1 | #ifndef _M68KNOMMU_PAGE_H |
| 2 | #define _M68KNOMMU_PAGE_H | 2 | #define _M68KNOMMU_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | /* PAGE_SHIFT determines the page size */ | 4 | /* PAGE_SHIFT determines the page size */ |
| 7 | 5 | ||
| 8 | #define PAGE_SHIFT (12) | 6 | #define PAGE_SHIFT (12) |
| @@ -78,6 +76,4 @@ extern unsigned long memory_end; | |||
| 78 | 76 | ||
| 79 | #include <asm-generic/page.h> | 77 | #include <asm-generic/page.h> |
| 80 | 78 | ||
| 81 | #endif /* __KERNEL__ */ | ||
| 82 | |||
| 83 | #endif /* _M68KNOMMU_PAGE_H */ | 79 | #endif /* _M68KNOMMU_PAGE_H */ |
diff --git a/include/asm-mips/elf.h b/include/asm-mips/elf.h index 766f91ad5cd3..f69f7acba637 100644 --- a/include/asm-mips/elf.h +++ b/include/asm-mips/elf.h | |||
| @@ -239,8 +239,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; | |||
| 239 | 239 | ||
| 240 | #endif /* !defined(ELF_ARCH) */ | 240 | #endif /* !defined(ELF_ARCH) */ |
| 241 | 241 | ||
| 242 | #ifdef __KERNEL__ | ||
| 243 | |||
| 244 | struct mips_abi; | 242 | struct mips_abi; |
| 245 | 243 | ||
| 246 | extern struct mips_abi mips_abi; | 244 | extern struct mips_abi mips_abi; |
| @@ -328,8 +326,6 @@ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); | |||
| 328 | #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) \ | 326 | #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) \ |
| 329 | dump_task_fpu(tsk, elf_fpregs) | 327 | dump_task_fpu(tsk, elf_fpregs) |
| 330 | 328 | ||
| 331 | #endif /* __KERNEL__ */ | ||
| 332 | |||
| 333 | #define USE_ELF_CORE_DUMP | 329 | #define USE_ELF_CORE_DUMP |
| 334 | #define ELF_EXEC_PAGESIZE PAGE_SIZE | 330 | #define ELF_EXEC_PAGESIZE PAGE_SIZE |
| 335 | 331 | ||
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index d2ea983bec06..635aa44d2290 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h | |||
| @@ -9,9 +9,6 @@ | |||
| 9 | #ifndef _ASM_PAGE_H | 9 | #ifndef _ASM_PAGE_H |
| 10 | #define _ASM_PAGE_H | 10 | #define _ASM_PAGE_H |
| 11 | 11 | ||
| 12 | |||
| 13 | #ifdef __KERNEL__ | ||
| 14 | |||
| 15 | #include <spaces.h> | 12 | #include <spaces.h> |
| 16 | 13 | ||
| 17 | /* | 14 | /* |
| @@ -190,6 +187,4 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 190 | #include <asm-generic/memory_model.h> | 187 | #include <asm-generic/memory_model.h> |
| 191 | #include <asm-generic/page.h> | 188 | #include <asm-generic/page.h> |
| 192 | 189 | ||
| 193 | #endif /* defined (__KERNEL__) */ | ||
| 194 | |||
| 195 | #endif /* _ASM_PAGE_H */ | 190 | #endif /* _ASM_PAGE_H */ |
diff --git a/include/asm-mips/user.h b/include/asm-mips/user.h index 61f2a093b91b..89bf8b4cab3c 100644 --- a/include/asm-mips/user.h +++ b/include/asm-mips/user.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #ifndef _ASM_USER_H | 8 | #ifndef _ASM_USER_H |
| 9 | #define _ASM_USER_H | 9 | #define _ASM_USER_H |
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | ||
| 12 | |||
| 13 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 14 | #include <asm/reg.h> | 12 | #include <asm/reg.h> |
| 15 | 13 | ||
| @@ -57,6 +55,4 @@ struct user { | |||
| 57 | #define HOST_DATA_START_ADDR (u.start_data) | 55 | #define HOST_DATA_START_ADDR (u.start_data) |
| 58 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | 56 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) |
| 59 | 57 | ||
| 60 | #endif /* __KERNEL__ */ | ||
| 61 | |||
| 62 | #endif /* _ASM_USER_H */ | 58 | #endif /* _ASM_USER_H */ |
diff --git a/include/asm-parisc/elf.h b/include/asm-parisc/elf.h index 8e7946a141de..ce0c0d844c7d 100644 --- a/include/asm-parisc/elf.h +++ b/include/asm-parisc/elf.h | |||
| @@ -237,14 +237,11 @@ typedef unsigned long elf_greg_t; | |||
| 237 | 237 | ||
| 238 | #define ELF_PLATFORM ("PARISC\0" /*+((boot_cpu_data.x86-3)*5) */) | 238 | #define ELF_PLATFORM ("PARISC\0" /*+((boot_cpu_data.x86-3)*5) */) |
| 239 | 239 | ||
| 240 | #ifdef __KERNEL__ | ||
| 241 | #define SET_PERSONALITY(ex, ibcs2) \ | 240 | #define SET_PERSONALITY(ex, ibcs2) \ |
| 242 | current->personality = PER_LINUX; \ | 241 | current->personality = PER_LINUX; \ |
| 243 | current->thread.map_base = DEFAULT_MAP_BASE; \ | 242 | current->thread.map_base = DEFAULT_MAP_BASE; \ |
| 244 | current->thread.task_size = DEFAULT_TASK_SIZE \ | 243 | current->thread.task_size = DEFAULT_TASK_SIZE \ |
| 245 | 244 | ||
| 246 | #endif | ||
| 247 | |||
| 248 | /* | 245 | /* |
| 249 | * Fill in general registers in a core dump. This saves pretty | 246 | * Fill in general registers in a core dump. This saves pretty |
| 250 | * much the same registers as hp-ux, although in a different order. | 247 | * much the same registers as hp-ux, although in a different order. |
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index b59a1504fc7a..b08d9151c71e 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _PARISC_PAGE_H | 1 | #ifndef _PARISC_PAGE_H |
| 2 | #define _PARISC_PAGE_H | 2 | #define _PARISC_PAGE_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <linux/const.h> | 4 | #include <linux/const.h> |
| 7 | 5 | ||
| 8 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) | 6 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) |
| @@ -175,6 +173,4 @@ extern int npmem_ranges; | |||
| 175 | #include <asm-generic/memory_model.h> | 173 | #include <asm-generic/memory_model.h> |
| 176 | #include <asm-generic/page.h> | 174 | #include <asm-generic/page.h> |
| 177 | 175 | ||
| 178 | #endif /* __KERNEL__ */ | ||
| 179 | |||
| 180 | #endif /* _PARISC_PAGE_H */ | 176 | #endif /* _PARISC_PAGE_H */ |
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index 236a9210e5fc..61e3725bbd37 100644 --- a/include/asm-powerpc/page.h +++ b/include/asm-powerpc/page.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifdef __KERNEL__ | ||
| 14 | #include <asm/asm-compat.h> | 13 | #include <asm/asm-compat.h> |
| 15 | #include <asm/kdump.h> | 14 | #include <asm/kdump.h> |
| 16 | 15 | ||
| @@ -194,6 +193,4 @@ struct vm_area_struct; | |||
| 194 | #include <asm-generic/memory_model.h> | 193 | #include <asm-generic/memory_model.h> |
| 195 | #endif /* __ASSEMBLY__ */ | 194 | #endif /* __ASSEMBLY__ */ |
| 196 | 195 | ||
| 197 | #endif /* __KERNEL__ */ | ||
| 198 | |||
| 199 | #endif /* _ASM_POWERPC_PAGE_H */ | 196 | #endif /* _ASM_POWERPC_PAGE_H */ |
diff --git a/include/asm-powerpc/page_32.h b/include/asm-powerpc/page_32.h index 17110aff26e7..65ea19eec956 100644 --- a/include/asm-powerpc/page_32.h +++ b/include/asm-powerpc/page_32.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef _ASM_POWERPC_PAGE_32_H | 1 | #ifndef _ASM_POWERPC_PAGE_32_H |
| 2 | #define _ASM_POWERPC_PAGE_32_H | 2 | #define _ASM_POWERPC_PAGE_32_H |
| 3 | #ifdef __KERNEL__ | ||
| 4 | 3 | ||
| 5 | #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32 | 4 | #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32 |
| 6 | 5 | ||
| @@ -32,5 +31,4 @@ extern void copy_page(void *to, void *from); | |||
| 32 | 31 | ||
| 33 | #endif /* __ASSEMBLY__ */ | 32 | #endif /* __ASSEMBLY__ */ |
| 34 | 33 | ||
| 35 | #endif /* __KERNEL__ */ | ||
| 36 | #endif /* _ASM_POWERPC_PAGE_32_H */ | 34 | #endif /* _ASM_POWERPC_PAGE_32_H */ |
diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h index 4ee82c61e4d7..67834eae5702 100644 --- a/include/asm-powerpc/page_64.h +++ b/include/asm-powerpc/page_64.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef _ASM_POWERPC_PAGE_64_H | 1 | #ifndef _ASM_POWERPC_PAGE_64_H |
| 2 | #define _ASM_POWERPC_PAGE_64_H | 2 | #define _ASM_POWERPC_PAGE_64_H |
| 3 | #ifdef __KERNEL__ | ||
| 4 | 3 | ||
| 5 | /* | 4 | /* |
| 6 | * Copyright (C) 2001 PPC64 Team, IBM Corp | 5 | * Copyright (C) 2001 PPC64 Team, IBM Corp |
| @@ -183,5 +182,4 @@ do { \ | |||
| 183 | 182 | ||
| 184 | #include <asm-generic/page.h> | 183 | #include <asm-generic/page.h> |
| 185 | 184 | ||
| 186 | #endif /* __KERNEL__ */ | ||
| 187 | #endif /* _ASM_POWERPC_PAGE_64_H */ | 185 | #endif /* _ASM_POWERPC_PAGE_64_H */ |
diff --git a/include/asm-powerpc/user.h b/include/asm-powerpc/user.h index e59ade4b3dfb..ba8dd4c12d96 100644 --- a/include/asm-powerpc/user.h +++ b/include/asm-powerpc/user.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_USER_H | 1 | #ifndef _ASM_POWERPC_USER_H |
| 2 | #define _ASM_POWERPC_USER_H | 2 | #define _ASM_POWERPC_USER_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <asm/ptrace.h> | 4 | #include <asm/ptrace.h> |
| 7 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 8 | 6 | ||
| @@ -50,6 +48,4 @@ struct user { | |||
| 50 | #define HOST_TEXT_START_ADDR (u.start_code) | 48 | #define HOST_TEXT_START_ADDR (u.start_code) |
| 51 | #define HOST_DATA_START_ADDR (u.start_data) | 49 | #define HOST_DATA_START_ADDR (u.start_data) |
| 52 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | 50 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) |
| 53 | |||
| 54 | #endif /* __KERNEL__ */ | ||
| 55 | #endif /* _ASM_POWERPC_USER_H */ | 51 | #endif /* _ASM_POWERPC_USER_H */ |
diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h index 91d06325cc79..b73a424d0f97 100644 --- a/include/asm-s390/elf.h +++ b/include/asm-s390/elf.h | |||
| @@ -113,7 +113,6 @@ | |||
| 113 | typedef s390_fp_regs elf_fpregset_t; | 113 | typedef s390_fp_regs elf_fpregset_t; |
| 114 | typedef s390_regs elf_gregset_t; | 114 | typedef s390_regs elf_gregset_t; |
| 115 | 115 | ||
| 116 | #ifdef __KERNEL__ | ||
| 117 | #include <linux/sched.h> /* for task_struct */ | 116 | #include <linux/sched.h> /* for task_struct */ |
| 118 | #include <asm/system.h> /* for save_access_regs */ | 117 | #include <asm/system.h> /* for save_access_regs */ |
| 119 | 118 | ||
| @@ -214,6 +213,5 @@ do { \ | |||
| 214 | clear_thread_flag(TIF_31BIT); \ | 213 | clear_thread_flag(TIF_31BIT); \ |
| 215 | } while (0) | 214 | } while (0) |
| 216 | #endif /* __s390x__ */ | 215 | #endif /* __s390x__ */ |
| 217 | #endif | ||
| 218 | 216 | ||
| 219 | #endif | 217 | #endif |
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index 584d0ee3c7f6..a55f9d979dfb 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #define PAGE_DEFAULT_ACC 0 | 19 | #define PAGE_DEFAULT_ACC 0 |
| 20 | #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) | 20 | #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) |
| 21 | 21 | ||
| 22 | #ifdef __KERNEL__ | ||
| 23 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
| 24 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |
| 25 | 24 | ||
| @@ -172,6 +171,4 @@ static inline int pfn_valid(unsigned long pfn) | |||
| 172 | #include <asm-generic/memory_model.h> | 171 | #include <asm-generic/memory_model.h> |
| 173 | #include <asm-generic/page.h> | 172 | #include <asm-generic/page.h> |
| 174 | 173 | ||
| 175 | #endif /* __KERNEL__ */ | ||
| 176 | |||
| 177 | #endif /* _S390_PAGE_H */ | 174 | #endif /* _S390_PAGE_H */ |
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 002e64a4f049..e0fe02950f52 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/const.h> | 8 | #include <linux/const.h> |
| 9 | 9 | ||
| 10 | #ifdef __KERNEL__ | ||
| 11 | |||
| 12 | /* PAGE_SHIFT determines the page size */ | 10 | /* PAGE_SHIFT determines the page size */ |
| 13 | #if defined(CONFIG_PAGE_SIZE_4KB) | 11 | #if defined(CONFIG_PAGE_SIZE_4KB) |
| 14 | # define PAGE_SHIFT 12 | 12 | # define PAGE_SHIFT 12 |
| @@ -178,5 +176,4 @@ typedef struct { unsigned long pgd; } pgd_t; | |||
| 178 | #define ARCH_SLAB_MINALIGN 8 | 176 | #define ARCH_SLAB_MINALIGN 8 |
| 179 | #endif | 177 | #endif |
| 180 | 178 | ||
| 181 | #endif /* __KERNEL__ */ | ||
| 182 | #endif /* __ASM_SH_PAGE_H */ | 179 | #endif /* __ASM_SH_PAGE_H */ |
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index aaf6ef40ee2f..668814e1e539 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h | |||
| @@ -85,7 +85,6 @@ typedef struct { | |||
| 85 | unsigned int pr_q[64]; | 85 | unsigned int pr_q[64]; |
| 86 | } elf_fpregset_t; | 86 | } elf_fpregset_t; |
| 87 | 87 | ||
| 88 | #ifdef __KERNEL__ | ||
| 89 | #include <asm/mbus.h> | 88 | #include <asm/mbus.h> |
| 90 | #include <asm/uaccess.h> | 89 | #include <asm/uaccess.h> |
| 91 | 90 | ||
| @@ -166,6 +165,4 @@ do { unsigned long *dest = &(__elf_regs[0]); \ | |||
| 166 | 165 | ||
| 167 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 166 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 168 | 167 | ||
| 169 | #endif /* __KERNEL__ */ | ||
| 170 | |||
| 171 | #endif /* !(__ASMSPARC_ELF_H) */ | 168 | #endif /* !(__ASMSPARC_ELF_H) */ |
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index ff57648eb8f8..cbc48c0c4e15 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #ifndef _SPARC_PAGE_H | 8 | #ifndef _SPARC_PAGE_H |
| 9 | #define _SPARC_PAGE_H | 9 | #define _SPARC_PAGE_H |
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | ||
| 12 | |||
| 13 | #ifdef CONFIG_SUN4 | 11 | #ifdef CONFIG_SUN4 |
| 14 | #define PAGE_SHIFT 13 | 12 | #define PAGE_SHIFT 13 |
| 15 | #else | 13 | #else |
| @@ -163,6 +161,4 @@ extern unsigned long pfn_base; | |||
| 163 | #include <asm-generic/memory_model.h> | 161 | #include <asm-generic/memory_model.h> |
| 164 | #include <asm-generic/page.h> | 162 | #include <asm-generic/page.h> |
| 165 | 163 | ||
| 166 | #endif /* __KERNEL__ */ | ||
| 167 | |||
| 168 | #endif /* _SPARC_PAGE_H */ | 164 | #endif /* _SPARC_PAGE_H */ |
diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h index 8653e8665009..dc7bc63e507e 100644 --- a/include/asm-sparc64/elf.h +++ b/include/asm-sparc64/elf.h | |||
| @@ -7,11 +7,9 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 10 | #ifdef __KERNEL__ | ||
| 11 | #include <asm/processor.h> | 10 | #include <asm/processor.h> |
| 12 | #include <asm/uaccess.h> | 11 | #include <asm/uaccess.h> |
| 13 | #include <asm/spitfire.h> | 12 | #include <asm/spitfire.h> |
| 14 | #endif | ||
| 15 | 13 | ||
| 16 | /* | 14 | /* |
| 17 | * Sparc section types | 15 | * Sparc section types |
| @@ -175,7 +173,6 @@ static inline unsigned int sparc64_elf_hwcap(void) | |||
| 175 | 173 | ||
| 176 | #define ELF_PLATFORM (NULL) | 174 | #define ELF_PLATFORM (NULL) |
| 177 | 175 | ||
| 178 | #ifdef __KERNEL__ | ||
| 179 | #define SET_PERSONALITY(ex, ibcs2) \ | 176 | #define SET_PERSONALITY(ex, ibcs2) \ |
| 180 | do { unsigned long new_flags = current_thread_info()->flags; \ | 177 | do { unsigned long new_flags = current_thread_info()->flags; \ |
| 181 | new_flags &= _TIF_32BIT; \ | 178 | new_flags &= _TIF_32BIT; \ |
| @@ -194,6 +191,5 @@ do { unsigned long new_flags = current_thread_info()->flags; \ | |||
| 194 | else if (current->personality != PER_LINUX32) \ | 191 | else if (current->personality != PER_LINUX32) \ |
| 195 | set_personality(PER_LINUX); \ | 192 | set_personality(PER_LINUX); \ |
| 196 | } while (0) | 193 | } while (0) |
| 197 | #endif | ||
| 198 | 194 | ||
| 199 | #endif /* !(__ASM_SPARC64_ELF_H) */ | 195 | #endif /* !(__ASM_SPARC64_ELF_H) */ |
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index 7af1077451ff..cdf950e017ee 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | #ifndef _SPARC64_PAGE_H | 3 | #ifndef _SPARC64_PAGE_H |
| 4 | #define _SPARC64_PAGE_H | 4 | #define _SPARC64_PAGE_H |
| 5 | 5 | ||
| 6 | #ifdef __KERNEL__ | ||
| 7 | |||
| 8 | #include <linux/const.h> | 6 | #include <linux/const.h> |
| 9 | 7 | ||
| 10 | #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) | 8 | #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) |
| @@ -143,5 +141,4 @@ typedef unsigned long pgprot_t; | |||
| 143 | 141 | ||
| 144 | #include <asm-generic/page.h> | 142 | #include <asm-generic/page.h> |
| 145 | 143 | ||
| 146 | #endif /* __KERNEL__ */ | ||
| 147 | #endif /* _SPARC64_PAGE_H */ | 144 | #endif /* _SPARC64_PAGE_H */ |
diff --git a/include/asm-v850/elf.h b/include/asm-v850/elf.h index 7db8edffb1c6..28f5b176ff1a 100644 --- a/include/asm-v850/elf.h +++ b/include/asm-v850/elf.h | |||
| @@ -94,8 +94,6 @@ typedef struct user_fpu_struct elf_fpregset_t; | |||
| 94 | 0; \ | 94 | 0; \ |
| 95 | } while (0) | 95 | } while (0) |
| 96 | 96 | ||
| 97 | #ifdef __KERNEL__ | ||
| 98 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) | 97 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) |
| 99 | #endif | ||
| 100 | 98 | ||
| 101 | #endif /* __V850_ELF_H__ */ | 99 | #endif /* __V850_ELF_H__ */ |
diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h index d693ffb1364d..661d8cd08839 100644 --- a/include/asm-v850/page.h +++ b/include/asm-v850/page.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #ifndef __V850_PAGE_H__ | 14 | #ifndef __V850_PAGE_H__ |
| 15 | #define __V850_PAGE_H__ | 15 | #define __V850_PAGE_H__ |
| 16 | 16 | ||
| 17 | #ifdef __KERNEL__ | ||
| 18 | |||
| 19 | #include <asm/machdep.h> | 17 | #include <asm/machdep.h> |
| 20 | 18 | ||
| 21 | 19 | ||
| @@ -126,6 +124,4 @@ typedef unsigned long pgprot_t; | |||
| 126 | #include <asm-generic/memory_model.h> | 124 | #include <asm-generic/memory_model.h> |
| 127 | #include <asm-generic/page.h> | 125 | #include <asm-generic/page.h> |
| 128 | 126 | ||
| 129 | #endif /* KERNEL */ | ||
| 130 | |||
| 131 | #endif /* __V850_PAGE_H__ */ | 127 | #endif /* __V850_PAGE_H__ */ |
diff --git a/include/asm-v850/user.h b/include/asm-v850/user.h index ccf4cea6dc9c..be90eea5285b 100644 --- a/include/asm-v850/user.h +++ b/include/asm-v850/user.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* Adapted from <asm-ppc/user.h>. */ | 4 | /* Adapted from <asm-ppc/user.h>. */ |
| 5 | 5 | ||
| 6 | #ifdef __KERNEL__ | ||
| 7 | |||
| 8 | #include <linux/ptrace.h> | 6 | #include <linux/ptrace.h> |
| 9 | #include <asm/page.h> | 7 | #include <asm/page.h> |
| 10 | 8 | ||
| @@ -51,6 +49,4 @@ struct user { | |||
| 51 | #define HOST_DATA_START_ADDR (u.start_data) | 49 | #define HOST_DATA_START_ADDR (u.start_data) |
| 52 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | 50 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) |
| 53 | 51 | ||
| 54 | #endif /* __KERNEL__ */ | ||
| 55 | |||
| 56 | #endif /* __V850_USER_H__ */ | 52 | #endif /* __V850_USER_H__ */ |
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h index d9c94e707289..fb62f9941e38 100644 --- a/include/asm-x86/elf.h +++ b/include/asm-x86/elf.h | |||
| @@ -72,7 +72,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t; | |||
| 72 | 72 | ||
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | #ifdef __KERNEL__ | ||
| 76 | #include <asm/vdso.h> | 75 | #include <asm/vdso.h> |
| 77 | 76 | ||
| 78 | extern unsigned int vdso_enabled; | 77 | extern unsigned int vdso_enabled; |
| @@ -321,6 +320,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack); | |||
| 321 | extern unsigned long arch_randomize_brk(struct mm_struct *mm); | 320 | extern unsigned long arch_randomize_brk(struct mm_struct *mm); |
| 322 | #define arch_randomize_brk arch_randomize_brk | 321 | #define arch_randomize_brk arch_randomize_brk |
| 323 | 322 | ||
| 324 | #endif /* __KERNEL__ */ | ||
| 325 | |||
| 326 | #endif | 323 | #endif |
diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h index 484715abe74a..999873b22e7f 100644 --- a/include/asm-x86/user.h +++ b/include/asm-x86/user.h | |||
| @@ -1,13 +1,5 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifdef CONFIG_X86_32 |
| 2 | # ifdef CONFIG_X86_32 | 2 | # include "user_32.h" |
| 3 | # include "user_32.h" | ||
| 4 | # else | ||
| 5 | # include "user_64.h" | ||
| 6 | # endif | ||
| 7 | #else | 3 | #else |
| 8 | # ifdef __i386__ | 4 | # include "user_64.h" |
| 9 | # include "user_32.h" | ||
| 10 | # else | ||
| 11 | # include "user_64.h" | ||
| 12 | # endif | ||
| 13 | #endif | 5 | #endif |
diff --git a/include/asm-xtensa/elf.h b/include/asm-xtensa/elf.h index 7083d46766a8..467384542502 100644 --- a/include/asm-xtensa/elf.h +++ b/include/asm-xtensa/elf.h | |||
| @@ -257,8 +257,6 @@ extern void xtensa_elf_core_copy_regs (xtensa_gregset_t *, struct pt_regs *); | |||
| 257 | _r->areg[12]=0; _r->areg[13]=0; _r->areg[14]=0; _r->areg[15]=0; \ | 257 | _r->areg[12]=0; _r->areg[13]=0; _r->areg[14]=0; _r->areg[15]=0; \ |
| 258 | } while (0) | 258 | } while (0) |
| 259 | 259 | ||
| 260 | #ifdef __KERNEL__ | ||
| 261 | |||
| 262 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) | 260 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT) |
| 263 | 261 | ||
| 264 | struct task_struct; | 262 | struct task_struct; |
| @@ -272,5 +270,4 @@ extern void do_save_fpregs (elf_fpregset_t*, struct pt_regs*, | |||
| 272 | extern int do_restore_fpregs (elf_fpregset_t*, struct pt_regs*, | 270 | extern int do_restore_fpregs (elf_fpregset_t*, struct pt_regs*, |
| 273 | struct task_struct*); | 271 | struct task_struct*); |
| 274 | 272 | ||
| 275 | #endif /* __KERNEL__ */ | ||
| 276 | #endif /* _XTENSA_ELF_H */ | 273 | #endif /* _XTENSA_ELF_H */ |
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index 55ce2c9749a3..1adedbf41d01 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_PAGE_H | 11 | #ifndef _XTENSA_PAGE_H |
| 12 | #define _XTENSA_PAGE_H | 12 | #define _XTENSA_PAGE_H |
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | ||
| 15 | |||
| 16 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
| 17 | #include <asm/types.h> | 15 | #include <asm/types.h> |
| 18 | #include <asm/cache.h> | 16 | #include <asm/cache.h> |
| @@ -174,5 +172,4 @@ extern void copy_user_page(void*, void*, unsigned long, struct page*); | |||
| 174 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 172 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 175 | 173 | ||
| 176 | #include <asm-generic/memory_model.h> | 174 | #include <asm-generic/memory_model.h> |
| 177 | #endif /* __KERNEL__ */ | ||
| 178 | #endif /* _XTENSA_PAGE_H */ | 175 | #endif /* _XTENSA_PAGE_H */ |
