x86: apic/io_apic fix compilation warning
PATCH 1/1 x86: apic/io_apic fix compilation warning
Hello Ingo,
Is this fix looks OK to you:
From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 21 Mar 2009 15:41:17 +0530
Subject: [PATCH] x86: apic/io_apic fix compilation warning
Fix:
arch/x86/kernel/apic/io_apic.c:1431: warning: ‘msi_ir_chip’ defined but not used
--- arch/x86/kernel/apic/io_apic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kernel/apic/io_apic.c +2 -1
@@ -1428,7 +1428,6 @@ void __setup_vector_irq(int cpu)static struct irq_chip ioapic_chip;static struct irq_chip ir_ioapic_chip; -static struct irq_chip msi_ir_chip;#define IOAPIC_AUTO -1#define IOAPIC_EDGE 0
@@ -3402,6 +3401,8 @@ static struct irq_chip msi_ir_chip = {#endif .retrigger = ioapic_retrigger_irq, }; +#else +static struct irq_chip msi_ir_chip;#endif /*
Signature · 1 line
1.6.0.6
Quoted 29 lines · Jaswinder Singh Rajput
Hello Ingo,
Is this fix looks OK to you:
From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 21 Mar 2009 15:41:17 +0530
Subject: [PATCH] x86: apic/io_apic fix compilation warningFix:
arch/x86/kernel/apic/io_apic.c:1431: warning: ‘msi_ir_chip’ defined but not usedSigned-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/kernel/apic/io_apic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)arch/x86/kernel/apic/io_apic.c +0
-1@@ -1428,7 +1428,6 @@ void __setup_vector_irq(int cpu)static struct irq_chip ioapic_chip;static struct irq_chip ir_ioapic_chip; -static struct irq_chip msi_ir_chip;#define IOAPIC_AUTO -1#define IOAPIC_EDGE 0
arch/x86/kernel/apic/io_apic.c static struct irq_chip msi_ir_chip = { · line 3406
Quoted 6 lines
arch/x86/kernel/apic/io_apic.c +2
-0@@ -3402,6 +3401,8 @@ static struct irq_chip msi_ir_chip = {#endif .retrigger = ioapic_retrigger_irq, }; +#else +static struct irq_chip msi_ir_chip;#endif
hm, i think it would be cleaner to remove the CONFIG_INTR_REMAP define altogether and define msi_ir_chip all the time. (and make sure this build fine even in the !INTR_REMAP case)
Ingo
Quoted 4 lines · Ingo Molnar
hm, i think it would be cleaner to remove the
CONFIG_INTR_REMAPdefine altogether and definemsi_ir_chipall the time. (and make sure this build fine even in the !INTR_REMAP case)
Is this looks OK to you and can you please check this in your magic .config files:
From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 21 Mar 2009 23:40:00 +0530
Subject: [PATCH] x86: apic/io_apic.c define msi_ir_chip and ir_ioapic_chip all the time
move out msi_ir_chip and ir_ioapic_chip from CONFIG_INTR_REMAP shadow
Fix:
arch/x86/kernel/apic/io_apic.c:1431: warning: ‘msi_ir_chip’ defined but not used
--- arch/x86/kernel/apic/io_apic.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/io_apic.c +4 -5
@@ -1428,7 +1428,6 @@ void __setup_vector_irq(int cpu)static struct irq_chip ioapic_chip;static struct irq_chip ir_ioapic_chip; -static struct irq_chip msi_ir_chip;#define IOAPIC_AUTO -1#define IOAPIC_EDGE 0
@@ -2663,20 +2662,20 @@ static struct irq_chip ioapic_chip __read_mostly = { .retrigger = ioapic_retrigger_irq, }; -#ifdef CONFIG_INTR_REMAP static struct irq_chip ir_ioapic_chip__read_mostly = { .name ="IR-IO-APIC" , .startup = startup_ioapic_irq, .mask = mask_IO_APIC_irq, .unmask = unmask_IO_APIC_irq, +#ifdef CONFIG_INTR_REMAP .ack = ack_x2apic_edge, .eoi = ack_x2apic_level, #ifdef CONFIG_SMP .set_affinity = set_ir_ioapic_affinity_irq, #endif +#endif .retrigger = ioapic_retrigger_irq, }; -#endif static inline void init_IO_APIC_traps (void ) {
@@ -3391,18 +3390,18 @@ static struct irq_chip msi_chip = { .retrigger = ioapic_retrigger_irq, }; -#ifdef CONFIG_INTR_REMAP static struct irq_chip msi_ir_chip = { .name ="IR-PCI-MSI" , .unmask = unmask_msi_irq, .mask = mask_msi_irq, +#ifdef CONFIG_INTR_REMAP .ack = ack_x2apic_edge, #ifdef CONFIG_SMP .set_affinity = ir_set_msi_irq_affinity, #endif +#endif .retrigger = ioapic_retrigger_irq, }; -#endif /* * Map the PCI dev to the corresponding remapping hardware unit
Signature · 1 line
1.6.0.6