diff options
author | Kirill A. Shutemov <k.shutemov@gmail.com> | 2008-02-07 03:15:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:30 -0500 |
commit | 516c25a86f6bdad77ded01a43c52c5569c8d690c (patch) | |
tree | e7404e73fd103f70958ccb1bc1c74ff1c7ff48bf /include/asm-alpha | |
parent | c1445db9f72db0537c43a2eab6e1b0f6741162f5 (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-alpha')
-rw-r--r-- | include/asm-alpha/elf.h | 3 | ||||
-rw-r--r-- | include/asm-alpha/page.h | 3 |
2 files changed, 0 insertions, 6 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 */ |