summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/io.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 16:18:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-06 18:06:53 +0200
commit0962f402af1bb0b53ccee626785d202a10c12fff (patch)
tree26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/io.h
parent19268ed7449c561694d048a34601a30e2d1aaf79 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
downloadop-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.zip
op-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.tar.gz
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts: arch/x86/kernel/process_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/io.h')
-rw-r--r--include/asm-x86/io.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index 688f8a4..72b7719 100644
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
@@ -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
OpenPOWER on IntegriCloud