Merge branch 'linus' into sched/urgent

Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index dd9d7b54f1a1..70e4bad23432 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -345,7 +345,7 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
 
                 desc = irq_desc + irq;
                 cfg = irq_cfg + irq;
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
                 if (!cfg->move_cleanup_count)
                         goto unlock;
 
@@ -358,7 +358,7 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
                 spin_unlock_irqrestore(&vector_lock, flags);
                 cfg->move_cleanup_count--;
         unlock:
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
         }
         return IRQ_HANDLED;
 }