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

Commit 323a01c5 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] genirq: irq: remove msi hacks 



Because of the nasty way that CONFIG_PCI_MSI was implemented we wound up with
set_irq_info and set_native_irq_info, with move_irq and move_native_irq.  Both
functions did the same thing but they were built and called under different
circumstances.  Now that the msi hacks are gone we can kill move_irq and
set_irq_info.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rajesh Shah <rajesh.shah@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: "Protasevich, Natalie" <Natalie.Protasevich@UNISYS.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ace80ab7

include/linux/irq.h

+0 −36
Original line number Diff line number Diff line
@@ -207,36 +207,6 @@ void set_pending_irq(unsigned int irq, cpumask_t mask); 
void move_native_irq(int irq);

void move_masked_irq(int irq);



#ifdef CONFIG_PCI_MSI

/*

 * Wonder why these are dummies?

 * For e.g the set_ioapic_affinity_vector() calls the set_ioapic_affinity_irq()

 * counter part after translating the vector to irq info. We need to perform

 * this operation on the real irq, when we dont use vector, i.e when

 * pci_use_vector() is false.

 */

static inline void move_irq(int irq)

{

}



static inline void set_irq_info(int irq, cpumask_t mask)

{

}



#else /* CONFIG_PCI_MSI */



static inline void move_irq(int irq)

{

	move_native_irq(irq);

}



static inline void set_irq_info(int irq, cpumask_t mask)

{

	set_native_irq_info(irq, mask);

}



#endif /* CONFIG_PCI_MSI */



#else /* CONFIG_GENERIC_PENDING_IRQ || CONFIG_IRQBALANCE */



static inline void move_irq(int irq)
@@ -255,16 +225,10 @@ static inline void set_pending_irq(unsigned int irq, cpumask_t mask) 
{

}



static inline void set_irq_info(int irq, cpumask_t mask)

{

	set_native_irq_info(irq, mask);

}



#endif /* CONFIG_GENERIC_PENDING_IRQ */



#else /* CONFIG_SMP */



#define move_irq(x)

#define move_native_irq(x)

#define move_masked_irq(x)