aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2012-09-26 06:44:46 -0400
committerJoerg Roedel <joro@8bytes.org>2013-01-28 06:17:27 -0500
commit9f9d39e403faf5e1a22334fe4df96516e4f389a8 (patch)
treee181e0166d2c7eb29c0ee3f29d844b8a764c226f
parent9b1b0e42f54bc452817f4bb6a8d939afe4f04303 (diff)
x86, io-apic: Remove !irq_remapped() check from __target_IO_APIC_irq()
This function is only called from default_ioapic_set_affinity() which is only used when interrupt remapping is disabled since the introduction of the set_affinity function pointer. So the check will always evaluate as true and can be removed. Signed-off-by: Joerg Roedel <joro@8bytes.org> Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/kernel/apic/io_apic.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 0fd5f30bac7f..5b7eb70c143c 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2299,12 +2299,8 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq
2299 2299
2300 apic = entry->apic; 2300 apic = entry->apic;
2301 pin = entry->pin; 2301 pin = entry->pin;
2302 /* 2302
2303 * With interrupt-remapping, destination information comes 2303 io_apic_write(apic, 0x11 + pin*2, dest);
2304 * from interrupt-remapping table entry.
2305 */
2306 if (!irq_remapped(cfg))
2307 io_apic_write(apic, 0x11 + pin*2, dest);
2308 reg = io_apic_read(apic, 0x10 + pin*2); 2304 reg = io_apic_read(apic, 0x10 + pin*2);
2309 reg &= ~IO_APIC_REDIR_VECTOR_MASK; 2305 reg &= ~IO_APIC_REDIR_VECTOR_MASK;
2310 reg |= vector; 2306 reg |= vector;