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-x86/user.h | |
| 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-x86/user.h')
| -rw-r--r-- | include/asm-x86/user.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h index 484715abe74a..999873b22e7f 100644 --- a/include/asm-x86/user.h +++ b/include/asm-x86/user.h | |||
| @@ -1,13 +1,5 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifdef CONFIG_X86_32 |
| 2 | # ifdef CONFIG_X86_32 | 2 | # include "user_32.h" |
| 3 | # include "user_32.h" | ||
| 4 | # else | ||
| 5 | # include "user_64.h" | ||
| 6 | # endif | ||
| 7 | #else | 3 | #else |
| 8 | # ifdef __i386__ | 4 | # include "user_64.h" |
| 9 | # include "user_32.h" | ||
| 10 | # else | ||
| 11 | # include "user_64.h" | ||
| 12 | # endif | ||
| 13 | #endif | 5 | #endif |