diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-04-20 15:02:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-26 11:35:46 -0400 |
| commit | b11caa7c7063ea92a0a58115d3fc6d038ed89510 (patch) | |
| tree | 485f8affcc0a98b7fc172c1d500c81a054408439 /include/asm-x86/unistd.h | |
| parent | 5065dbafc299507f16731434e95b91dadff03006 (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.h | 8 |
1 files changed, 7 insertions, 1 deletions
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 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifdef __KERNEL__ |
| 2 | # if defined(CONFIG_X86_32) || defined(__i386__) | 2 | # ifdef CONFIG_X86_32 |
| 3 | # include "unistd_32.h" | ||
| 4 | # else | ||
| 5 | # include "unistd_64.h" | ||
| 6 | # endif | ||
| 7 | #else | ||
| 8 | # ifdef __i386__ | ||
| 3 | # include "unistd_32.h" | 9 | # include "unistd_32.h" |
| 4 | # else | 10 | # else |
| 5 | # include "unistd_64.h" | 11 | # include "unistd_64.h" |