diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/pci/intr_remapping.h | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci/intr_remapping.h')
| -rw-r--r-- | drivers/pci/intr_remapping.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pci/intr_remapping.h b/drivers/pci/intr_remapping.h new file mode 100644 index 000000000000..ca48f0df8ac9 --- /dev/null +++ b/drivers/pci/intr_remapping.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #include <linux/intel-iommu.h> | ||
| 2 | |||
| 3 | struct ioapic_scope { | ||
| 4 | struct intel_iommu *iommu; | ||
| 5 | unsigned int id; | ||
| 6 | }; | ||
| 7 | |||
| 8 | #define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) | ||