From b11caa7c7063ea92a0a58115d3fc6d038ed89510 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 20 Apr 2008 22:02:17 +0300 Subject: [PATCH] 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 Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar --- include/asm-x86/posix_types.h | 8 +++++++- 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 fe312a5ba2..bb7133dc15 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 effc7ad8e1..2a58ed3e51 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" -- 2.39.5