Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 516c25a86f6bdad77ded01a43c52c5569c8d690c

Authored by Kirill A. Shutemov
Committed by Linus Torvalds
1 parent c1445db9f7
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed 

asm/elf.h, asm/page.h and asm/user.h don't export to userspace now, so we can
drop #ifdef __KERNEL__ for them.

[k.shutemov@gmail.com: remove #ifdef __KERNEL_]
Signed-off-by: Kirill A. Shutemov <k.shutemov@gmail.com>
Reviewed-by: David Woodhouse <dwmw2@infradead.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Kirill A. Shutemov <k.shutemov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 45 changed files with 3 additions and 150 deletions Side-by-side Diff

include/asm-alpha/elf.h
Diff comments   View file @ 516c25a
... ... @@ -144,8 +144,6 @@
144 144 : amask (AMASK_CIX) ? "ev6" : "ev67"); \
145 145 })
146 146  
147   -#ifdef __KERNEL__
148   -
149 147 #define SET_PERSONALITY(EX, IBCS2) \
150 148 set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
151 149 ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
... ... @@ -164,6 +162,5 @@
164 162 NEW_AUX_ENT(AT_L3_CACHESHAPE, alpha_l3_cacheshape); \
165 163 } while (0)
166 164  
167   -#endif /* __KERNEL__ */
168 165 #endif /* __ASM_ALPHA_ELF_H */
include/asm-alpha/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _ALPHA_PAGE_H
2 2 #define _ALPHA_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 #include <linux/const.h>
7 5 #include <asm/pal.h>
8 6  
... ... @@ -98,6 +96,5 @@
98 96 #include <asm-generic/memory_model.h>
99 97 #include <asm-generic/page.h>
100 98  
101   -#endif /* __KERNEL__ */
102 99 #endif /* _ALPHA_PAGE_H */
include/asm-arm/elf.h
Diff comments   View file @ 516c25a
... ... @@ -41,7 +41,6 @@
41 41 #endif
42 42 #define ELF_ARCH EM_ARM
43 43  
44   -#ifdef __KERNEL__
45 44 #ifndef __ASSEMBLY__
46 45 /*
47 46 * This yields a string that ld.so will use to load implementation
... ... @@ -113,8 +112,6 @@
113 112 clear_thread_flag(TIF_USING_IWMMXT); \
114 113 } \
115 114 } while (0)
116   -
117   -#endif
118 115  
119 116 #endif
include/asm-arm/page.h
Diff comments   View file @ 516c25a
... ... @@ -10,9 +10,6 @@
10 10 #ifndef _ASMARM_PAGE_H
11 11 #define _ASMARM_PAGE_H
12 12  
13   -
14   -#ifdef __KERNEL__
15   -
16 13 /* PAGE_SHIFT determines the page size */
17 14 #define PAGE_SHIFT 12
18 15 #define PAGE_SIZE (1UL << PAGE_SHIFT)
... ... @@ -191,8 +188,6 @@
191 188 #endif
192 189  
193 190 #include <asm-generic/page.h>
194   -
195   -#endif /* __KERNEL__ */
196 191  
197 192 #endif
include/asm-avr32/elf.h
Diff comments   View file @ 516c25a
... ... @@ -103,9 +103,7 @@
103 103  
104 104 #define ELF_PLATFORM (NULL)
105 105  
106   -#ifdef __KERNEL__
107 106 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
108   -#endif
109 107  
110 108 #endif /* __ASM_AVR32_ELF_H */
include/asm-avr32/page.h
Diff comments   View file @ 516c25a
... ... @@ -8,8 +8,6 @@
8 8 #ifndef __ASM_AVR32_PAGE_H
9 9 #define __ASM_AVR32_PAGE_H
10 10  
11   -#ifdef __KERNEL__
12   -
13 11 /* PAGE_SHIFT determines the page size */
14 12 #define PAGE_SHIFT 12
15 13 #ifdef __ASSEMBLY__
... ... @@ -106,8 +104,6 @@
106 104 * Memory above this physical address will be considered highmem.
107 105 */
108 106 #define HIGHMEM_START 0x20000000UL
109   -
110   -#endif /* __KERNEL__ */
111 107  
112 108 #endif /* __ASM_AVR32_PAGE_H */
include/asm-blackfin/elf.h
Diff comments   View file @ 516c25a
... ... @@ -120,9 +120,7 @@
120 120  
121 121 #define ELF_PLATFORM (NULL)
122 122  
123   -#ifdef __KERNEL__
124 123 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
125   -#endif
126 124  
127 125 #endif
include/asm-blackfin/page.h
Diff comments   View file @ 516c25a
... ... @@ -11,8 +11,6 @@
11 11 #endif
12 12 #define PAGE_MASK (~(PAGE_SIZE-1))
13 13  
14   -#ifdef __KERNEL__
15   -
16 14 #include <asm/setup.h>
17 15  
18 16 #ifndef __ASSEMBLY__
... ... @@ -88,7 +86,6 @@
88 86 #include <asm-generic/page.h>
89 87  
90 88 #endif /* __ASSEMBLY__ */
91   -#endif /* __KERNEL__ */
92 89  
93 90 #endif /* _BLACKFIN_PAGE_H */
include/asm-cris/elf.h
Diff comments   View file @ 516c25a
... ... @@ -45,7 +45,6 @@
45 45 #define ELF_DATA ELFDATA2LSB
46 46 #define ELF_ARCH EM_CRIS
47 47  
48   -#ifdef __KERNEL__
49 48 #include <asm/arch/elf.h>
50 49  
51 50 /* The master for these definitions is {binutils}/include/elf/cris.h: */
... ... @@ -90,8 +89,6 @@
90 89 #define ELF_PLATFORM (NULL)
91 90  
92 91 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
93   -
94   -#endif /* __KERNEL__ */
95 92  
96 93 #endif
include/asm-cris/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _CRIS_PAGE_H
2 2 #define _CRIS_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 #include <asm/arch/page.h>
7 5 #include <linux/const.h>
8 6  
... ... @@ -73,8 +71,6 @@
73 71  
74 72 #include <asm-generic/memory_model.h>
75 73 #include <asm-generic/page.h>
76   -
77   -#endif /* __KERNEL__ */
78 74  
79 75 #endif /* _CRIS_PAGE_H */
include/asm-frv/elf.h
Diff comments   View file @ 516c25a
... ... @@ -137,9 +137,7 @@
137 137  
138 138 #define ELF_PLATFORM (NULL)
139 139  
140   -#ifdef __KERNEL__
141 140 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
142   -#endif
143 141  
144 142 #endif
include/asm-frv/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _ASM_PAGE_H
2 2 #define _ASM_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 #include <asm/virtconvert.h>
7 5 #include <asm/mem-layout.h>
8 6 #include <asm/sections.h>
... ... @@ -78,8 +76,6 @@
78 76  
79 77 #include <asm-generic/memory_model.h>
80 78 #include <asm-generic/page.h>
81   -
82   -#endif /* __KERNEL__ */
83 79  
84 80 #endif /* _ASM_PAGE_H */
include/asm-h8300/elf.h
Diff comments   View file @ 516c25a
... ... @@ -55,9 +55,7 @@
55 55  
56 56 #define ELF_PLATFORM (NULL)
57 57  
58   -#ifdef __KERNEL__
59 58 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)
60   -#endif
61 59  
62 60 #define R_H8_NONE 0
63 61 #define R_H8_DIR32 1
include/asm-h8300/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _H8300_PAGE_H
2 2 #define _H8300_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 /* PAGE_SHIFT determines the page size */
7 5  
8 6 #define PAGE_SHIFT (12)
... ... @@ -78,8 +76,6 @@
78 76  
79 77 #include <asm-generic/memory_model.h>
80 78 #include <asm-generic/page.h>
81   -
82   -#endif /* __KERNEL__ */
83 79  
84 80 #endif /* _H8300_PAGE_H */
include/asm-ia64/elf.h
Diff comments   View file @ 516c25a
... ... @@ -177,7 +177,6 @@
177 177 relevant until we have real hardware to play with... */
178 178 #define ELF_PLATFORM NULL
179 179  
180   -#ifdef __KERNEL__
181 180 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)
182 181 #define elf_read_implies_exec(ex, executable_stack) \
183 182 ((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)
... ... @@ -247,8 +246,6 @@
247 246 } \
248 247 } \
249 248 } while (0)
250   -
251   -#endif /* __KERNEL__ */
252 249  
253 250 #endif /* _ASM_IA64_ELF_H */
include/asm-ia64/page.h
Diff comments   View file @ 516c25a
... ... @@ -7,8 +7,6 @@
7 7 * David Mosberger-Tang <davidm@hpl.hp.com>
8 8 */
9 9  
10   -# ifdef __KERNEL__
11   -
12 10 #include <asm/intrinsics.h>
13 11 #include <asm/types.h>
14 12  
... ... @@ -227,6 +225,5 @@
227 225 (((current->personality & READ_IMPLIES_EXEC) != 0) \
228 226 ? VM_EXEC : 0))
229 227  
230   -# endif /* __KERNEL__ */
231 228 #endif /* _ASM_IA64_PAGE_H */
include/asm-m32r/elf.h
Diff comments   View file @ 516c25a
... ... @@ -129,9 +129,7 @@
129 129 intent than poking at uname or /proc/cpuinfo. */
130 130 #define ELF_PLATFORM (NULL)
131 131  
132   -#ifdef __KERNEL__
133 132 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)
134   -#endif
135 133  
136 134 #endif /* _ASM_M32R__ELF_H */
include/asm-m32r/page.h
Diff comments   View file @ 516c25a
... ... @@ -6,7 +6,6 @@
6 6 #define PAGE_SIZE (1UL << PAGE_SHIFT)
7 7 #define PAGE_MASK (~(PAGE_SIZE-1))
8 8  
9   -#ifdef __KERNEL__
10 9 #ifndef __ASSEMBLY__
11 10  
12 11 extern void clear_page(void *to);
... ... @@ -87,6 +86,5 @@
87 86 #include <asm-generic/memory_model.h>
88 87 #include <asm-generic/page.h>
89 88  
90   -#endif /* __KERNEL__ */
91 89 #endif /* _ASM_M32R_PAGE_H */
include/asm-m68k/elf.h
Diff comments   View file @ 516c25a
... ... @@ -114,9 +114,7 @@
114 114  
115 115 #define ELF_PLATFORM (NULL)
116 116  
117   -#ifdef __KERNEL__
118 117 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
119   -#endif
120 118  
121 119 #endif
include/asm-m68k/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _M68K_PAGE_H
2 2 #define _M68K_PAGE_H
3 3  
4   -
5   -#ifdef __KERNEL__
6   -
7 4 #include <linux/const.h>
8 5  
9 6 /* PAGE_SHIFT determines the page size */
... ... @@ -229,8 +226,6 @@
229 226 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
230 227  
231 228 #include <asm-generic/page.h>
232   -
233   -#endif /* __KERNEL__ */
234 229  
235 230 #endif /* _M68K_PAGE_H */
include/asm-m68knommu/elf.h
Diff comments   View file @ 516c25a
... ... @@ -105,9 +105,7 @@
105 105  
106 106 #define ELF_PLATFORM (NULL)
107 107  
108   -#ifdef __KERNEL__
109 108 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
110   -#endif
111 109  
112 110 #endif
include/asm-m68knommu/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _M68KNOMMU_PAGE_H
2 2 #define _M68KNOMMU_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 /* PAGE_SHIFT determines the page size */
7 5  
8 6 #define PAGE_SHIFT (12)
... ... @@ -77,8 +75,6 @@
77 75 #endif /* __ASSEMBLY__ */
78 76  
79 77 #include <asm-generic/page.h>
80   -
81   -#endif /* __KERNEL__ */
82 78  
83 79 #endif /* _M68KNOMMU_PAGE_H */
include/asm-mips/elf.h
Diff comments   View file @ 516c25a
... ... @@ -239,8 +239,6 @@
239 239  
240 240 #endif /* !defined(ELF_ARCH) */
241 241  
242   -#ifdef __KERNEL__
243   -
244 242 struct mips_abi;
245 243  
246 244 extern struct mips_abi mips_abi;
... ... @@ -327,8 +325,6 @@
327 325 #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
328 326 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) \
329 327 dump_task_fpu(tsk, elf_fpregs)
330   -
331   -#endif /* __KERNEL__ */
332 328  
333 329 #define USE_ELF_CORE_DUMP
334 330 #define ELF_EXEC_PAGESIZE PAGE_SIZE
include/asm-mips/page.h
Diff comments   View file @ 516c25a
... ... @@ -9,9 +9,6 @@
9 9 #ifndef _ASM_PAGE_H
10 10 #define _ASM_PAGE_H
11 11  
12   -
13   -#ifdef __KERNEL__
14   -
15 12 #include <spaces.h>
16 13  
17 14 /*
... ... @@ -189,8 +186,6 @@
189 186  
190 187 #include <asm-generic/memory_model.h>
191 188 #include <asm-generic/page.h>
192   -
193   -#endif /* defined (__KERNEL__) */
194 189  
195 190 #endif /* _ASM_PAGE_H */
include/asm-mips/user.h
Diff comments   View file @ 516c25a
... ... @@ -8,8 +8,6 @@
8 8 #ifndef _ASM_USER_H
9 9 #define _ASM_USER_H
10 10  
11   -#ifdef __KERNEL__
12   -
13 11 #include <asm/page.h>
14 12 #include <asm/reg.h>
15 13  
... ... @@ -56,8 +54,6 @@
56 54 #define HOST_TEXT_START_ADDR (u.start_code)
57 55 #define HOST_DATA_START_ADDR (u.start_data)
58 56 #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
59   -
60   -#endif /* __KERNEL__ */
61 57  
62 58 #endif /* _ASM_USER_H */
include/asm-parisc/elf.h
Diff comments   View file @ 516c25a
... ... @@ -237,13 +237,10 @@
237 237  
238 238 #define ELF_PLATFORM ("PARISC\0" /*+((boot_cpu_data.x86-3)*5) */)
239 239  
240   -#ifdef __KERNEL__
241 240 #define SET_PERSONALITY(ex, ibcs2) \
242 241 current->personality = PER_LINUX; \
243 242 current->thread.map_base = DEFAULT_MAP_BASE; \
244 243 current->thread.task_size = DEFAULT_TASK_SIZE \
245   -
246   -#endif
247 244  
248 245 /*
249 246 * Fill in general registers in a core dump. This saves pretty
include/asm-parisc/page.h
Diff comments   View file @ 516c25a
1 1 #ifndef _PARISC_PAGE_H
2 2 #define _PARISC_PAGE_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 #include <linux/const.h>
7 5  
8 6 #if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
... ... @@ -174,8 +172,6 @@
174 172  
175 173 #include <asm-generic/memory_model.h>
176 174 #include <asm-generic/page.h>
177   -
178   -#endif /* __KERNEL__ */
179 175  
180 176 #endif /* _PARISC_PAGE_H */
include/asm-powerpc/page.h
Diff comments   View file @ 516c25a
... ... @@ -10,7 +10,6 @@
10 10 * 2 of the License, or (at your option) any later version.
11 11 */
12 12  
13   -#ifdef __KERNEL__
14 13 #include <asm/asm-compat.h>
15 14 #include <asm/kdump.h>
16 15  
... ... @@ -193,8 +192,6 @@
193 192  
194 193 #include <asm-generic/memory_model.h>
195 194 #endif /* __ASSEMBLY__ */
196   -
197   -#endif /* __KERNEL__ */
198 195  
199 196 #endif /* _ASM_POWERPC_PAGE_H */
include/asm-powerpc/page_32.h
Diff comments   View file @ 516c25a
1 1 #ifndef _ASM_POWERPC_PAGE_32_H
2 2 #define _ASM_POWERPC_PAGE_32_H
3   -#ifdef __KERNEL__
4 3  
5 4 #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32
6 5  
... ... @@ -32,6 +31,5 @@
32 31  
33 32 #endif /* __ASSEMBLY__ */
34 33  
35   -#endif /* __KERNEL__ */
36 34 #endif /* _ASM_POWERPC_PAGE_32_H */
include/asm-powerpc/page_64.h
Diff comments   View file @ 516c25a
1 1 #ifndef _ASM_POWERPC_PAGE_64_H
2 2 #define _ASM_POWERPC_PAGE_64_H
3   -#ifdef __KERNEL__
4 3  
5 4 /*
6 5 * Copyright (C) 2001 PPC64 Team, IBM Corp
... ... @@ -183,6 +182,5 @@
183 182  
184 183 #include <asm-generic/page.h>
185 184  
186   -#endif /* __KERNEL__ */
187 185 #endif /* _ASM_POWERPC_PAGE_64_H */
include/asm-powerpc/user.h
Diff comments   View file @ 516c25a
1 1 #ifndef _ASM_POWERPC_USER_H
2 2 #define _ASM_POWERPC_USER_H
3 3  
4   -#ifdef __KERNEL__
5   -
6 4 #include <asm/ptrace.h>
7 5 #include <asm/page.h>
8 6  
... ... @@ -50,7 +48,5 @@
50 48 #define HOST_TEXT_START_ADDR (u.start_code)
51 49 #define HOST_DATA_START_ADDR (u.start_data)
52 50 #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
53   -
54   -#endif /* __KERNEL__ */
55 51 #endif /* _ASM_POWERPC_USER_H */
include/asm-s390/elf.h
Diff comments   View file @ 516c25a
... ... @@ -113,7 +113,6 @@
113 113 typedef s390_fp_regs elf_fpregset_t;
114 114 typedef s390_regs elf_gregset_t;
115 115  
116   -#ifdef __KERNEL__
117 116 #include <linux/sched.h> /* for task_struct */
118 117 #include <asm/system.h> /* for save_access_regs */
119 118  
... ... @@ -214,7 +213,6 @@
214 213 clear_thread_flag(TIF_31BIT); \
215 214 } while (0)
216 215 #endif /* __s390x__ */
217   -#endif
218 216  
219 217 #endif
include/asm-s390/page.h
Diff comments   View file @ 516c25a
... ... @@ -19,7 +19,6 @@
19 19 #define PAGE_DEFAULT_ACC 0
20 20 #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4)
21 21  
22   -#ifdef __KERNEL__
23 22 #include <asm/setup.h>
24 23 #ifndef __ASSEMBLY__
25 24  
... ... @@ -171,8 +170,6 @@
171 170  
172 171 #include <asm-generic/memory_model.h>
173 172 #include <asm-generic/page.h>
174   -
175   -#endif /* __KERNEL__ */
176 173  
177 174 #endif /* _S390_PAGE_H */
include/asm-sh/page.h
Diff comments   View file @ 516c25a
... ... @@ -7,8 +7,6 @@
7 7  
8 8 #include <linux/const.h>
9 9  
10   -#ifdef __KERNEL__
11   -
12 10 /* PAGE_SHIFT determines the page size */
13 11 #if defined(CONFIG_PAGE_SIZE_4KB)
14 12 # define PAGE_SHIFT 12
... ... @@ -178,6 +176,5 @@
178 176 #define ARCH_SLAB_MINALIGN 8
179 177 #endif
180 178  
181   -#endif /* __KERNEL__ */
182 179 #endif /* __ASM_SH_PAGE_H */
include/asm-sparc/elf.h
Diff comments   View file @ 516c25a
... ... @@ -85,7 +85,6 @@
85 85 unsigned int pr_q[64];
86 86 } elf_fpregset_t;
87 87  
88   -#ifdef __KERNEL__
89 88 #include <asm/mbus.h>
90 89 #include <asm/uaccess.h>
91 90  
... ... @@ -165,8 +164,6 @@
165 164 #define ELF_PLATFORM (NULL)
166 165  
167 166 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
168   -
169   -#endif /* __KERNEL__ */
170 167  
171 168 #endif /* !(__ASMSPARC_ELF_H) */
include/asm-sparc/page.h
Diff comments   View file @ 516c25a
... ... @@ -8,8 +8,6 @@
8 8 #ifndef _SPARC_PAGE_H
9 9 #define _SPARC_PAGE_H
10 10  
11   -#ifdef __KERNEL__
12   -
13 11 #ifdef CONFIG_SUN4
14 12 #define PAGE_SHIFT 13
15 13 #else
... ... @@ -162,8 +160,6 @@
162 160  
163 161 #include <asm-generic/memory_model.h>
164 162 #include <asm-generic/page.h>
165   -
166   -#endif /* __KERNEL__ */
167 163  
168 164 #endif /* _SPARC_PAGE_H */
include/asm-sparc64/elf.h
Diff comments   View file @ 516c25a
... ... @@ -7,11 +7,9 @@
7 7 */
8 8  
9 9 #include <asm/ptrace.h>
10   -#ifdef __KERNEL__
11 10 #include <asm/processor.h>
12 11 #include <asm/uaccess.h>
13 12 #include <asm/spitfire.h>
14   -#endif
15 13  
16 14 /*
17 15 * Sparc section types
... ... @@ -175,7 +173,6 @@
175 173  
176 174 #define ELF_PLATFORM (NULL)
177 175  
178   -#ifdef __KERNEL__
179 176 #define SET_PERSONALITY(ex, ibcs2) \
180 177 do { unsigned long new_flags = current_thread_info()->flags; \
181 178 new_flags &= _TIF_32BIT; \
... ... @@ -194,7 +191,6 @@
194 191 else if (current->personality != PER_LINUX32) \
195 192 set_personality(PER_LINUX); \
196 193 } while (0)
197   -#endif
198 194  
199 195 #endif /* !(__ASM_SPARC64_ELF_H) */
include/asm-sparc64/page.h
Diff comments   View file @ 516c25a
... ... @@ -3,8 +3,6 @@
3 3 #ifndef _SPARC64_PAGE_H
4 4 #define _SPARC64_PAGE_H
5 5  
6   -#ifdef __KERNEL__
7   -
8 6 #include <linux/const.h>
9 7  
10 8 #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
... ... @@ -143,6 +141,5 @@
143 141  
144 142 #include <asm-generic/page.h>
145 143  
146   -#endif /* __KERNEL__ */
147 144 #endif /* _SPARC64_PAGE_H */
include/asm-v850/elf.h
Diff comments   View file @ 516c25a
... ... @@ -94,9 +94,7 @@
94 94 0; \
95 95 } while (0)
96 96  
97   -#ifdef __KERNEL__
98 97 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
99   -#endif
100 98  
101 99 #endif /* __V850_ELF_H__ */
include/asm-v850/page.h
Diff comments   View file @ 516c25a
... ... @@ -14,8 +14,6 @@
14 14 #ifndef __V850_PAGE_H__
15 15 #define __V850_PAGE_H__
16 16  
17   -#ifdef __KERNEL__
18   -
19 17 #include <asm/machdep.h>
20 18  
21 19  
... ... @@ -125,8 +123,6 @@
125 123  
126 124 #include <asm-generic/memory_model.h>
127 125 #include <asm-generic/page.h>
128   -
129   -#endif /* KERNEL */
130 126  
131 127 #endif /* __V850_PAGE_H__ */
include/asm-v850/user.h
Diff comments   View file @ 516c25a
... ... @@ -3,8 +3,6 @@
3 3  
4 4 /* Adapted from <asm-ppc/user.h>. */
5 5  
6   -#ifdef __KERNEL__
7   -
8 6 #include <linux/ptrace.h>
9 7 #include <asm/page.h>
10 8  
... ... @@ -50,8 +48,6 @@
50 48 #define HOST_TEXT_START_ADDR (u.start_code)
51 49 #define HOST_DATA_START_ADDR (u.start_data)
52 50 #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
53   -
54   -#endif /* __KERNEL__ */
55 51  
56 52 #endif /* __V850_USER_H__ */
include/asm-x86/elf.h
Diff comments   View file @ 516c25a
... ... @@ -72,7 +72,6 @@
72 72  
73 73 #endif
74 74  
75   -#ifdef __KERNEL__
76 75 #include <asm/vdso.h>
77 76  
78 77 extern unsigned int vdso_enabled;
... ... @@ -320,8 +319,6 @@
320 319  
321 320 extern unsigned long arch_randomize_brk(struct mm_struct *mm);
322 321 #define arch_randomize_brk arch_randomize_brk
323   -
324   -#endif /* __KERNEL__ */
325 322  
326 323 #endif
include/asm-x86/user.h
Diff comments   View file @ 516c25a
1   -#ifdef __KERNEL__
2   -# ifdef CONFIG_X86_32
3   -# include "user_32.h"
4   -# else
5   -# include "user_64.h"
6   -# endif
  1 +#ifdef CONFIG_X86_32
  2 +# include "user_32.h"
7 3 #else
8   -# ifdef __i386__
9   -# include "user_32.h"
10   -# else
11   -# include "user_64.h"
12   -# endif
  4 +# include "user_64.h"
13 5 #endif
include/asm-xtensa/elf.h
Diff comments   View file @ 516c25a
... ... @@ -257,8 +257,6 @@
257 257 _r->areg[12]=0; _r->areg[13]=0; _r->areg[14]=0; _r->areg[15]=0; \
258 258 } while (0)
259 259  
260   -#ifdef __KERNEL__
261   -
262 260 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
263 261  
264 262 struct task_struct;
... ... @@ -272,6 +270,5 @@
272 270 extern int do_restore_fpregs (elf_fpregset_t*, struct pt_regs*,
273 271 struct task_struct*);
274 272  
275   -#endif /* __KERNEL__ */
276 273 #endif /* _XTENSA_ELF_H */
include/asm-xtensa/page.h
Diff comments   View file @ 516c25a
... ... @@ -11,8 +11,6 @@
11 11 #ifndef _XTENSA_PAGE_H
12 12 #define _XTENSA_PAGE_H
13 13  
14   -#ifdef __KERNEL__
15   -
16 14 #include <asm/processor.h>
17 15 #include <asm/types.h>
18 16 #include <asm/cache.h>
... ... @@ -174,6 +172,5 @@
174 172 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
175 173  
176 174 #include <asm-generic/memory_model.h>
177   -#endif /* __KERNEL__ */
178 175 #endif /* _XTENSA_PAGE_H */