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

Commit 25629d81 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

x86: x2apic, IR: Move eoi_ioapic_irq() into a CONFIG_INTR_REMAP section 



Address the following complier warning:

   arch/x86/kernel/apic/io_apic.c:2543: warning: `eoi_ioapic_irq' defined but not used

By moving that function (and eoi_ioapic_irq()) into an existing
#ifdef CONFIG_INTR_REMAP section of the code.

[ Impact: cleanup ]

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Cc: dwmw2@infradead.org
Cc: Weidong Han <weidong.han@intel.com>
LKML-Reference: <20090420200450.271099000@linux-os.sc.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Weidong Han <weidong.han@intel.com>
parent fc1edaf9

arch/x86/kernel/apic/io_apic.c

+33 −33
Original line number Diff line number Diff line
@@ -2517,39 +2517,6 @@ static void irq_complete_move(struct irq_desc **descp) 
static inline void irq_complete_move(struct irq_desc **descp) {}

#endif



static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)

{

	int apic, pin;

	struct irq_pin_list *entry;



	entry = cfg->irq_2_pin;

	for (;;) {



		if (!entry)

			break;



		apic = entry->apic;

		pin = entry->pin;

		io_apic_eoi(apic, pin);

		entry = entry->next;

	}

}



static void

eoi_ioapic_irq(struct irq_desc *desc)

{

	struct irq_cfg *cfg;

	unsigned long flags;

	unsigned int irq;



	irq = desc->irq;

	cfg = desc->chip_data;



	spin_lock_irqsave(&ioapic_lock, flags);

	__eoi_ioapic_irq(irq, cfg);

	spin_unlock_irqrestore(&ioapic_lock, flags);

}



static void ack_apic_edge(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);
@@ -2659,6 +2626,39 @@ static void ack_apic_level(unsigned int irq) 
}



#ifdef CONFIG_INTR_REMAP

static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)

{

	int apic, pin;

	struct irq_pin_list *entry;



	entry = cfg->irq_2_pin;

	for (;;) {



		if (!entry)

			break;



		apic = entry->apic;

		pin = entry->pin;

		io_apic_eoi(apic, pin);

		entry = entry->next;

	}

}



static void

eoi_ioapic_irq(struct irq_desc *desc)

{

	struct irq_cfg *cfg;

	unsigned long flags;

	unsigned int irq;



	irq = desc->irq;

	cfg = desc->chip_data;



	spin_lock_irqsave(&ioapic_lock, flags);

	__eoi_ioapic_irq(irq, cfg);

	spin_unlock_irqrestore(&ioapic_lock, flags);

}



static void ir_ack_apic_edge(unsigned int irq)

{

	ack_APIC_irq();