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

Commit c777ac55 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] irq: uninline migration functions 



Uninline some massive IRQ migration functions.  Put them in the new
kernel/irq/migration.c.

Cc: Andi Kleen <ak@muc.de>
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 4cae59d2

include/linux/irq.h

+2 −47
Original line number Diff line number Diff line
@@ -114,53 +114,8 @@ static inline void set_native_irq_info(int irq, cpumask_t mask) 
#if defined (CONFIG_GENERIC_PENDING_IRQ) || defined (CONFIG_IRQBALANCE)

extern cpumask_t pending_irq_cpumask[NR_IRQS];



static inline void set_pending_irq(unsigned int irq, cpumask_t mask)

{

	irq_desc_t *desc = irq_desc + irq;

	unsigned long flags;



	spin_lock_irqsave(&desc->lock, flags);

	desc->move_irq = 1;

	pending_irq_cpumask[irq] = mask;

	spin_unlock_irqrestore(&desc->lock, flags);

}



static inline void

move_native_irq(int irq)

{

	cpumask_t tmp;

	irq_desc_t *desc = irq_descp(irq);



	if (likely (!desc->move_irq))

		return;



	desc->move_irq = 0;



	if (likely(cpus_empty(pending_irq_cpumask[irq])))

		return;



	if (!desc->handler->set_affinity)

		return;



	/* note - we hold the desc->lock */

	cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map);



	/*

	 * If there was a valid mask to work with, please

	 * do the disable, re-program, enable sequence.

	 * This is *not* particularly important for level triggered

	 * but in a edge trigger case, we might be setting rte

	 * when an active trigger is comming in. This could

	 * cause some ioapics to mal-function.

	 * Being paranoid i guess!

	 */

	if (unlikely(!cpus_empty(tmp))) {

		desc->handler->disable(irq);

		desc->handler->set_affinity(irq,tmp);

		desc->handler->enable(irq);

	}

	cpus_clear(pending_irq_cpumask[irq]);

}

void set_pending_irq(unsigned int irq, cpumask_t mask);

void move_native_irq(int irq);



#ifdef CONFIG_PCI_MSI

/*

kernel/irq/Makefile

+1 −2
Original line number Diff line number Diff line 


obj-y := handle.o manage.o spurious.o

obj-y := handle.o manage.o spurious.o migration.o

obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o

obj-$(CONFIG_PROC_FS) += proc.o

kernel/irq/migration.c

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#include <linux/irq.h>



#if defined(CONFIG_GENERIC_PENDING_IRQ)



void set_pending_irq(unsigned int irq, cpumask_t mask)

{

	irq_desc_t *desc = irq_desc + irq;

	unsigned long flags;



	spin_lock_irqsave(&desc->lock, flags);

	desc->move_irq = 1;

	pending_irq_cpumask[irq] = mask;

	spin_unlock_irqrestore(&desc->lock, flags);

}



void move_native_irq(int irq)

{

	cpumask_t tmp;

	irq_desc_t *desc = irq_descp(irq);



	if (likely (!desc->move_irq))

		return;



	desc->move_irq = 0;



	if (likely(cpus_empty(pending_irq_cpumask[irq])))

		return;



	if (!desc->handler->set_affinity)

		return;



	/* note - we hold the desc->lock */

	cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map);



	/*

	 * If there was a valid mask to work with, please

	 * do the disable, re-program, enable sequence.

	 * This is *not* particularly important for level triggered

	 * but in a edge trigger case, we might be setting rte

	 * when an active trigger is comming in. This could

	 * cause some ioapics to mal-function.

	 * Being paranoid i guess!

	 */

	if (unlikely(!cpus_empty(tmp))) {

		desc->handler->disable(irq);

		desc->handler->set_affinity(irq,tmp);

		desc->handler->enable(irq);

	}

	cpus_clear(pending_irq_cpumask[irq]);

}



#endif