git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
iommu.h
diff --git
a/arch/x86/include/asm/iommu.h
b/arch/x86/include/asm/iommu.h
index
af326a2
..
fd6d21b
100644
(file)
--- a/
arch/x86/include/asm/iommu.h
+++ b/
arch/x86/include/asm/iommu.h
@@
-6,6
+6,7
@@
extern void no_iommu_init(void);
extern struct dma_map_ops nommu_dma_ops;
extern int force_iommu, no_iommu;
extern int iommu_detected;
+extern int iommu_pass_through;
/* 10 seconds */
#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)