diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
| commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 (patch) | |
| tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 /include | |
| parent | 15e957d08dd4a841359cfec59ecb74041e0097aa (diff) | |
| parent | e0e42142bab96404de535cceb85d6533d5ad7942 (diff) | |
| download | linux-stable-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.gz linux-stable-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.bz2 linux-stable-4420471f14b79f2a42e4603be7794ea49b68bca4.zip | |
Merge branch 'x86/apic' into irq/numa
Conflicts:
arch/x86/kernel/apic/io_apic.c
Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h index e397dc342cda..10ff5c498824 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -108,6 +108,7 @@ struct irte { }; #ifdef CONFIG_INTR_REMAP extern int intr_remapping_enabled; +extern int intr_remapping_supported(void); extern int enable_intr_remapping(int); extern void disable_intr_remapping(void); extern int reenable_intr_remapping(int); @@ -157,6 +158,8 @@ static inline struct intel_iommu *map_ioapic_to_ir(int apic) } #define irq_remapped(irq) (0) #define enable_intr_remapping(mode) (-1) +#define disable_intr_remapping() (0) +#define reenable_intr_remapping(mode) (0) #define intr_remapping_enabled (0) #endif |