commit 516c25a86f6bdad77ded01a43c52c5569c8d690c
author Kirill A. Shutemov <k.shutemov@gmail.com> Thu Feb 07 00:15:54 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Feb 07 08:42:30 2008 -0800
tree e7404e73fd103f70958ccb1bc1c74ff1c7ff48bf
parent c1445db9f72db0537c43a2eab6e1b0f6741162f5

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>

include/asm-x86/user.h

diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h
index 484715a..999873b 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