From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 16 Dec 2009 17:33:49 +0000 (+0100)
Subject: Merge branch 'linus' into sched/urgent
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee1156c11a1121e118b0a7f2dec240f0d421b1fd;p=openwrt%2Fstaging%2Fblogic.git

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>
---

ee1156c11a1121e118b0a7f2dec240f0d421b1fd
diff --cc kernel/sched_idletask.c
index b810e22772d5,5f93b570d383..21b969a28725
--- a/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@@ -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)