lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks

Browse Source 
Apparently,

commit 6330a30a76
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 6093015db2
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>
This commit is contained in:
Vegard Nossum
2008-07-21 15:06:35 +02:00
committed by Ingo Molnar
parent 9d25d4db81
commit 04bbe430f7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-x86/processor-flags.h
View File

@@ -88,10 +88,12 @@
#define CX86_ARR_BASE 0xc4 #define CX86_ARR_BASE 0xc4
#define CX86_RCR_BASE 0xdc #define CX86_RCR_BASE 0xdc
#ifdef __KERNEL__
#ifdef CONFIG_VM86 #ifdef CONFIG_VM86
#define X86_VM_MASK X86_EFLAGS_VM #define X86_VM_MASK X86_EFLAGS_VM
#else #else
#define X86_VM_MASK 0 /* No VM86 support */ #define X86_VM_MASK 0 /* No VM86 support */
#endif #endif
#endif
#endif /* __ASM_I386_PROCESSOR_FLAGS_H */ #endif /* __ASM_I386_PROCESSOR_FLAGS_H */