aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
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-arm
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-arm')
-rw-r--r--include/asm-arm/elf.h3
-rw-r--r--include/asm-arm/page.h5
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