diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-07-21 15:06:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 12:49:53 +0200 |
| commit | 04bbe430f73c6c31bbd067349c029e907e153a8d (patch) | |
| tree | 9690157ea52c989a2accd52416cecf77710dec25 | |
| parent | 9d25d4db81833029d30b7b03cc1000cbbe09e192 (diff) | |
| download | linux-04bbe430f73c6c31bbd067349c029e907e153a8d.tar.gz linux-04bbe430f73c6c31bbd067349c029e907e153a8d.tar.bz2 linux-04bbe430f73c6c31bbd067349c029e907e153a8d.zip | |
x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks
Apparently,
commit 6330a30a76c1e62d4b4ec238368957f8febf9113
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date: Wed May 28 09:46:19 2008 +0200
x86: break mutual header inclusion
introduced some CONFIG names to processor-flags.h, which was exported in
commit 6093015db2bd9e70cf20cdd23be1a50733baafdd
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Mar 30 11:45:23 2008 +0200
x86: cleanup replace most vm86 flags with flags from processor-flags.h, fix
Fix it by wrapping the CONFIG parts in __KERNEL__.
Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Adrian Bunk <bunk@kernel.org>
Cc: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-x86/processor-flags.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h index 092b39b3a7e6..eff2ecd7fff0 100644 --- a/include/asm-x86/processor-flags.h +++ b/include/asm-x86/processor-flags.h @@ -88,10 +88,12 @@ #define CX86_ARR_BASE 0xc4 #define CX86_RCR_BASE 0xdc +#ifdef __KERNEL__ #ifdef CONFIG_VM86 #define X86_VM_MASK X86_EFLAGS_VM #else #define X86_VM_MASK 0 /* No VM86 support */ #endif +#endif #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ |