projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[linux-block.git]
/
include
/
asm-x86
/
processor-flags.h
diff --git
a/include/asm-x86/processor-flags.h
b/include/asm-x86/processor-flags.h
index 092b39b3a7e691588de38e4b3a44f2cf76f5051e..eff2ecd7fff067caf89bc48cd81bebe111a43363 100644
(file)
--- 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 */