diff options
| author | Kirill A. Shutemov | 2008-02-07 09:15:54 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-02-07 17:42:30 +0100 |
| commit | 516c25a86f6bdad77ded01a43c52c5569c8d690c (patch) | |
| tree | e7404e73fd103f70958ccb1bc1c74ff1c7ff48bf /include/asm-x86/user.h | |
| parent | Unexport asm/user.h and linux/user.h (diff) | |
| download | kernel-qcow2-linux-516c25a86f6bdad77ded01a43c52c5569c8d690c.tar.gz kernel-qcow2-linux-516c25a86f6bdad77ded01a43c52c5569c8d690c.tar.xz kernel-qcow2-linux-516c25a86f6bdad77ded01a43c52c5569c8d690c.zip | |
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 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "user_32.h" -# else -# include "user_64.h" -# endif +#ifdef CONFIG_X86_32 +# include "user_32.h" #else -# ifdef __i386__ -# include "user_32.h" -# else -# include "user_64.h" -# endif +# include "user_64.h" #endif |