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

Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

Browse Source 
Conflicts:
	arch/x86/kernel/process_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-10-06 16:18:26 +02:00
parent 19268ed744 8d7ccaa545
commit 0962f402af
38 changed files with 177 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-x86/io.h
View File

@@ -73,6 +73,8 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
#define writeq writeq
#endif
extern int iommu_bio_merge;
#ifdef CONFIG_X86_32
# include "io_32.h"
#else