Messages in this thread Patch in this message | | | Date | Thu, 24 Apr 2008 14:47:02 +0200 | From | Guillaume Thouvenin <> | Subject | [patch] Undo some parts of commit e40c0fe that makes too much cleanup |
| |
Hello,
This patch solves an issue that appears when compiling kvm-userspace on my x86_64 processor.
It undo some parts of the commit e40c0fe that cleans duplicate includes. The commit made too much cleanup ;) because it removed the "#else" part of the #ifdef __KERNEL__ in include/asm-x86/posix_types.h and in include/asm-x86/unistd.h
posix_types.h | 8 +++++++- unistd.h | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
Signed-off-by: guillaume.thouvenin@ext.bull.net
---
diff --git a/include/asm-x86/posix_types.h b/include/asm-x86/posix_types.h index fe312a5..bb7133d 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 effc7ad..2a58ed3 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"
| |