diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 10:36:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 10:36:57 -0700 |
commit | ca1ee219c070eab755712d50638bbcd1f8630fc1 (patch) | |
tree | c0c252a9095830aadc5dc9ffdd16d9167dd605c9 /include/linux/intel-iommu.h | |
parent | 3cc50ac0dbda5100684e570247782330155d35e0 (diff) | |
parent | afeeb7cebbd223ffee303fd8de4ba97458b13581 (diff) | |
download | linux-stable-ca1ee219c070eab755712d50638bbcd1f8630fc1.tar.gz linux-stable-ca1ee219c070eab755712d50638bbcd1f8630fc1.tar.bz2 linux-stable-ca1ee219c070eab755712d50638bbcd1f8630fc1.zip |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Fix address wrap on 32-bit kernel.
intel-iommu: Enable DMAR on 32-bit kernel.
intel-iommu: fix PCI device detach from virtual machine
intel-iommu: VT-d page table to support snooping control bit
iommu: Add domain_has_cap iommu_ops
intel-iommu: Snooping control support
Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c
Diffstat (limited to 'include/linux/intel-iommu.h')
-rw-r--r-- | include/linux/intel-iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 1d6c71d96ede..77214ead1a36 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -123,7 +123,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val) #define ecap_eim_support(e) ((e >> 4) & 0x1) #define ecap_ir_support(e) ((e >> 3) & 0x1) #define ecap_max_handle_mask(e) ((e >> 20) & 0xf) - +#define ecap_sc_support(e) ((e >> 7) & 0x1) /* Snooping Control */ /* IOTLB_REG */ #define DMA_TLB_FLUSH_GRANU_OFFSET 60 |