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-sparc | |
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-sparc')
-rw-r--r-- | include/asm-sparc/elf.h | 3 | ||||
-rw-r--r-- | include/asm-sparc/page.h | 4 |
2 files changed, 0 insertions, 7 deletions
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 */ |