diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:33:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:33:51 -0400 |
| commit | 6044110742bc2ae0577b962985e7c63e0634b2e9 (patch) | |
| tree | ab32f95f2b073d2bfcdf39909a718aa69ad127c6 /include/asm-x86 | |
| parent | 7540081c6b16dc941895bca840749cabfd0d3b48 (diff) | |
| parent | 04bbe430f73c6c31bbd067349c029e907e153a8d (diff) | |
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 092b39b3a7e6..eff2ecd7fff0 100644 --- a/include/asm-x86/processor-flags.h +++ b/include/asm-x86/processor-flags.h | |||
| @@ -88,10 +88,12 @@ | |||
| 88 | #define CX86_ARR_BASE 0xc4 | 88 | #define CX86_ARR_BASE 0xc4 |
| 89 | #define CX86_RCR_BASE 0xdc | 89 | #define CX86_RCR_BASE 0xdc |
| 90 | 90 | ||
| 91 | #ifdef __KERNEL__ | ||
| 91 | #ifdef CONFIG_VM86 | 92 | #ifdef CONFIG_VM86 |
| 92 | #define X86_VM_MASK X86_EFLAGS_VM | 93 | #define X86_VM_MASK X86_EFLAGS_VM |
| 93 | #else | 94 | #else |
| 94 | #define X86_VM_MASK 0 /* No VM86 support */ | 95 | #define X86_VM_MASK 0 /* No VM86 support */ |
| 95 | #endif | 96 | #endif |
| 97 | #endif | ||
| 96 | 98 | ||
| 97 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ | 99 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ |