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

Merge branch 'linus' into x86/header-guards

Browse Source 
Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-07-26 15:30:40 +02:00
parent a318631686 024e8ac044
commit 1503af6619
1956 changed files with 82958 additions and 60075 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_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_X86__PROCESSOR_FLAGS_H */