Merge branch 'linus' into sched/urgent
Ingo Molnar [Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)]
Conflicts:
kernel/sched_idletask.c

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

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

1  2 
kernel/sched.c
kernel/sched_idletask.c

diff --cc kernel/sched.c
Simple merge
@@@ -34,10 -34,10 +34,10 @@@ static struct task_struct *pick_next_ta
  static void
  dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
  {
-       spin_unlock_irq(&rq->lock);
+       raw_spin_unlock_irq(&rq->lock);
 -      printk(KERN_ERR "bad: scheduling from the idle thread!\n");
 +      pr_err("bad: scheduling from the idle thread!\n");
        dump_stack();
-       spin_lock_irq(&rq->lock);
+       raw_spin_lock_irq(&rq->lock);
  }
  
  static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)