diff options
author | Mark McLoughlin <markmc@redhat.com> | 2008-11-20 10:49:48 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 05:57:35 -0500 |
commit | a647dacbb1389aa6a5fa631766c1eaea35905890 (patch) | |
tree | 4f22d0c874bc22eb98037b485735df41aa06e67c | |
parent | 99126f7ce14aff5f9371b2fa81fddb82be815794 (diff) |
intel-iommu: move struct device_domain_info out of dma_remapping.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r-- | drivers/pci/intel-iommu.c | 10 | ||||
-rw-r--r-- | include/linux/dma_remapping.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 97c36b2ee611..f23a02054bf7 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -168,6 +168,16 @@ struct dmar_domain { | |||
168 | int flags; | 168 | int flags; |
169 | }; | 169 | }; |
170 | 170 | ||
171 | /* PCI domain-device relationship */ | ||
172 | struct device_domain_info { | ||
173 | struct list_head link; /* link to domain siblings */ | ||
174 | struct list_head global; /* link to global list */ | ||
175 | u8 bus; /* PCI bus numer */ | ||
176 | u8 devfn; /* PCI devfn number */ | ||
177 | struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */ | ||
178 | struct dmar_domain *domain; /* pointer to domain */ | ||
179 | }; | ||
180 | |||
171 | static void flush_unmaps_timeout(unsigned long data); | 181 | static void flush_unmaps_timeout(unsigned long data); |
172 | 182 | ||
173 | DEFINE_TIMER(unmap_timer, flush_unmaps_timeout, 0, 0); | 183 | DEFINE_TIMER(unmap_timer, flush_unmaps_timeout, 0, 0); |
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h index 333014468f17..4ef5f6bc0d68 100644 --- a/include/linux/dma_remapping.h +++ b/include/linux/dma_remapping.h | |||
@@ -16,16 +16,6 @@ struct intel_iommu; | |||
16 | struct dmar_domain; | 16 | struct dmar_domain; |
17 | struct root_entry; | 17 | struct root_entry; |
18 | 18 | ||
19 | /* PCI domain-device relationship */ | ||
20 | struct device_domain_info { | ||
21 | struct list_head link; /* link to domain siblings */ | ||
22 | struct list_head global; /* link to global list */ | ||
23 | u8 bus; /* PCI bus numer */ | ||
24 | u8 devfn; /* PCI devfn number */ | ||
25 | struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */ | ||
26 | struct dmar_domain *domain; /* pointer to domain */ | ||
27 | }; | ||
28 | |||
29 | extern void free_dmar_iommu(struct intel_iommu *iommu); | 19 | extern void free_dmar_iommu(struct intel_iommu *iommu); |
30 | 20 | ||
31 | extern int dmar_disabled; | 21 | extern int dmar_disabled; |