From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 25 Sep 2012 17:03:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
X-Git-Tag: v3.7-rc1~199^2~1^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=593d1006cdf710ab3469c0c37c184fea0bc3da97;p=~emulex%2Finfiniband.git

Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b

Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
---

593d1006cdf710ab3469c0c37c184fea0bc3da97
diff --cc kernel/sched/core.c
index 8c38b5e7ce4,649c9f876cb..1a48cdbc863
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -5607,18 -5604,8 +5604,10 @@@ migration_call(struct notifier_block *n
  		migrate_tasks(cpu);
  		BUG_ON(rq->nr_running != 1); /* the migration thread */
  		raw_spin_unlock_irqrestore(&rq->lock, flags);
 +		break;
  
 +	case CPU_DEAD:
- 		{
- 			struct rq *dest_rq;
- 
- 			local_irq_save(flags);
- 			dest_rq = cpu_rq(smp_processor_id());
- 			raw_spin_lock(&dest_rq->lock);
- 			calc_load_migrate(rq);
- 			raw_spin_unlock_irqrestore(&dest_rq->lock, flags);
- 		}
+ 		calc_load_migrate(rq);
  		break;
  #endif
  	}