diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 19:33:51 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 19:33:51 (GMT) |
commit | 6044110742bc2ae0577b962985e7c63e0634b2e9 (patch) | |
tree | ab32f95f2b073d2bfcdf39909a718aa69ad127c6 /include/asm-x86 | |
parent | 7540081c6b16dc941895bca840749cabfd0d3b48 (diff) | |
parent | 04bbe430f73c6c31bbd067349c029e907e153a8d (diff) | |
download | linux-6044110742bc2ae0577b962985e7c63e0634b2e9.tar.xz |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks
x86: BUILD_IRQ say .text to avoid .data.percpu
xen: don't use sysret for sysexit32
x86: call early_cpu_init at the same point
Diffstat (limited to 'include/asm-x86')
-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 092b39b..eff2ecd 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 */ |