diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-04-20 22:02:17 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-26 17:35:46 +0200 |
| commit | b11caa7c7063ea92a0a58115d3fc6d038ed89510 (patch) | |
| tree | 485f8affcc0a98b7fc172c1d500c81a054408439 | |
| parent | 5065dbafc299507f16731434e95b91dadff03006 (diff) | |
| download | linux-stable-b11caa7c7063ea92a0a58115d3fc6d038ed89510.tar.gz linux-stable-b11caa7c7063ea92a0a58115d3fc6d038ed89510.tar.bz2 linux-stable-b11caa7c7063ea92a0a58115d3fc6d038ed89510.zip | |
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>
| -rw-r--r-- | include/asm-x86/posix_types.h | 8 | ||||
| -rw-r--r-- | include/asm-x86/unistd.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/asm-x86/posix_types.h b/include/asm-x86/posix_types.h index fe312a5ba204..bb7133dc155d 100644 --- a/include/asm-x86/posix_types.h +++ b/include/asm-x86/posix_types.h @@ -1,5 +1,11 @@ #ifdef __KERNEL__ -# if defined(CONFIG_X86_32) || defined(__i386__) +# ifdef CONFIG_X86_32 +# include "posix_types_32.h" +# else +# include "posix_types_64.h" +# endif +#else +# ifdef __i386__ # include "posix_types_32.h" # else # include "posix_types_64.h" diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h index effc7ad8e12f..2a58ed3e51d8 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" |