diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 12:15:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 12:15:49 -0500 |
| commit | af37501c792107c2bde1524bdae38d9a247b841a (patch) | |
| tree | b50ee90d29e72956b8b7d8d19677fe5996755d49 /drivers/pci/intr_remapping.c | |
| parent | d859e29fe34cb833071b20aef860ee94fbad9bb2 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.
Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/intr_remapping.c')
| -rw-r--r-- | drivers/pci/intr_remapping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index f78371b22529..5a57753ea9fc 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/irq.h> | 6 | #include <linux/irq.h> |
| 7 | #include <asm/io_apic.h> | 7 | #include <asm/io_apic.h> |
| 8 | #include <asm/smp.h> | 8 | #include <asm/smp.h> |
| 9 | #include <asm/cpu.h> | ||
| 9 | #include <linux/intel-iommu.h> | 10 | #include <linux/intel-iommu.h> |
| 10 | #include "intr_remapping.h" | 11 | #include "intr_remapping.h" |
| 11 | 12 | ||