aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 19:49:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 19:49:24 -0700
commitbe98eb2c2fc88d9d61cfeab5c11ab1118ca0bba9 (patch)
tree2fda177b596534b9ec69d98f6843d24d7e234538 /include/linux
parentcf5434e894a17bb8385997adc6d56642055a85d6 (diff)
parentf007e99c8e2e322b8331aba72414715119a2920d (diff)
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6: Intel-IOMMU, intr-remap: source-id checking Intel-IOMMU, intr-remap: set the whole 128bits of irte when modify/free it IOMMU Identity Mapping Support (drivers/pci/intel_iommu.c)
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dmar.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 1731fb5fd77..4a2b162c256 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -126,6 +126,8 @@ extern int free_irte(int irq);
extern int irq_remapped(int irq);
extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev);
extern struct intel_iommu *map_ioapic_to_ir(int apic);
+extern int set_ioapic_sid(struct irte *irte, int apic);
+extern int set_msi_sid(struct irte *irte, struct pci_dev *dev);
#else
static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
{
@@ -156,6 +158,15 @@ static inline struct intel_iommu *map_ioapic_to_ir(int apic)
{
return NULL;
}
+static inline int set_ioapic_sid(struct irte *irte, int apic)
+{
+ return 0;
+}
+static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev)
+{
+ return 0;
+}
+
#define irq_remapped(irq) (0)
#define enable_intr_remapping(mode) (-1)
#define disable_intr_remapping() (0)