aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorKirill A. Shutemov <k.shutemov@gmail.com>2008-02-07 03:15:54 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:30 -0500
commit516c25a86f6bdad77ded01a43c52c5569c8d690c (patch)
treee7404e73fd103f70958ccb1bc1c74ff1c7ff48bf /include/asm-ia64
parentc1445db9f72db0537c43a2eab6e1b0f6741162f5 (diff)
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>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/elf.h3
-rw-r--r--include/asm-ia64/page.h3
2 files changed, 0 insertions, 6 deletions
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 */