diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 16:06:28 +0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 16:06:28 +0400 |
| commit | f93ea733878733f3e98475bc3e2ccf789bebcfb8 (patch) | |
| tree | ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0 /arch/x86/include | |
| parent | 00fb5430f547e411ab03385cfa548776aaac1c92 (diff) | |
| parent | 95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b (diff) | |
| download | linux-f93ea733878733f3e98475bc3e2ccf789bebcfb8.tar.xz | |
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
include/linux/iommu.h
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index 345c99cef152..dffc38ee6255 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h @@ -5,6 +5,7 @@ extern struct dma_map_ops nommu_dma_ops; extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; +extern int iommu_group_mf; /* 10 seconds */ #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) |