aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/unistd.h
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-04-20 22:02:17 +0300
committerIngo Molnar <mingo@elte.hu>2008-04-26 17:35:46 +0200
commitb11caa7c7063ea92a0a58115d3fc6d038ed89510 (patch)
tree485f8affcc0a98b7fc172c1d500c81a054408439 /include/asm-x86/unistd.h
parent5065dbafc299507f16731434e95b91dadff03006 (diff)
fix asm-x86/{posix_types,unistd}.h
Jeff Chua reported that: Commit e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 (x86: cleanup duplicate includes) turned the userspace asm-x86/posix_types.h and asm-x86/unistd.h headers into empty files. This patch reverts these bogus changes. Reported-by: Jeff Chua <jeff.chua.linux@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/unistd.h')
-rw-r--r--include/asm-x86/unistd.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h
index effc7ad8e12..2a58ed3e51d 100644
--- a/include/asm-x86/unistd.h
+++ b/include/asm-x86/unistd.h
@@ -1,5 +1,11 @@
#ifdef __KERNEL__
-# if defined(CONFIG_X86_32) || defined(__i386__)
+# ifdef CONFIG_X86_32
+# include "unistd_32.h"
+# else
+# include "unistd_64.h"
+# endif
+#else
+# ifdef __i386__
# include "unistd_32.h"
# else
# include "unistd_64.h"