Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e38ca5 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput
Browse files

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

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
parent 474e56b8

arch/x86/kernel/apic/io_apic.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -1428,7 +1428,6 @@ void __setup_vector_irq(int cpu) 




static struct irq_chip ioapic_chip;

static struct irq_chip ioapic_chip;

static struct irq_chip ir_ioapic_chip;

static struct irq_chip ir_ioapic_chip;

static struct irq_chip msi_ir_chip;





#define IOAPIC_AUTO     -1

#define IOAPIC_AUTO     -1

#define IOAPIC_EDGE     0

#define IOAPIC_EDGE     0
@@ -2663,20 +2662,20 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.retrigger	= ioapic_retrigger_irq,

	.retrigger	= ioapic_retrigger_irq,

};

};





#ifdef CONFIG_INTR_REMAP

static struct irq_chip ir_ioapic_chip __read_mostly = {

static struct irq_chip ir_ioapic_chip __read_mostly = {

	.name		= "IR-IO-APIC",

	.name		= "IR-IO-APIC",

	.startup	= startup_ioapic_irq,

	.startup	= startup_ioapic_irq,

	.mask		= mask_IO_APIC_irq,

	.mask		= mask_IO_APIC_irq,

	.unmask		= unmask_IO_APIC_irq,

	.unmask		= unmask_IO_APIC_irq,

#ifdef CONFIG_INTR_REMAP

	.ack		= ack_x2apic_edge,

	.ack		= ack_x2apic_edge,

	.eoi		= ack_x2apic_level,

	.eoi		= ack_x2apic_level,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.set_affinity	= set_ir_ioapic_affinity_irq,

	.set_affinity	= set_ir_ioapic_affinity_irq,

#endif

#endif

#endif

	.retrigger	= ioapic_retrigger_irq,

	.retrigger	= ioapic_retrigger_irq,

};

};

#endif





static inline void init_IO_APIC_traps(void)

static inline void init_IO_APIC_traps(void)

{

{
@@ -3391,18 +3390,18 @@ static struct irq_chip msi_chip = { 
	.retrigger	= ioapic_retrigger_irq,

	.retrigger	= ioapic_retrigger_irq,

};

};





#ifdef CONFIG_INTR_REMAP

static struct irq_chip msi_ir_chip = {

static struct irq_chip msi_ir_chip = {

	.name		= "IR-PCI-MSI",

	.name		= "IR-PCI-MSI",

	.unmask		= unmask_msi_irq,

	.unmask		= unmask_msi_irq,

	.mask		= mask_msi_irq,

	.mask		= mask_msi_irq,

#ifdef CONFIG_INTR_REMAP

	.ack		= ack_x2apic_edge,

	.ack		= ack_x2apic_edge,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.set_affinity	= ir_set_msi_irq_affinity,

	.set_affinity	= ir_set_msi_irq_affinity,

#endif

#endif

#endif

	.retrigger	= ioapic_retrigger_irq,

	.retrigger	= ioapic_retrigger_irq,

};

};

#endif





/*

/*

 * Map the PCI dev to the corresponding remapping hardware unit

 * Map the PCI dev to the corresponding remapping hardware unit