Merge branch 'upstream'

1 files changed, 2 insertions, 47 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 6c5d4c898ccb..ee2a82a572f7 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -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
 /*