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

Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b

The conflicts between kernel/rcutree.h and kernel/rcutree_plugin.h
were due to adjacent insertions and deletions, which were resolved
by simply accepting the changes on both branches.
---

5217192b85480353aeeb395574e60d0db04f3676
diff --cc kernel/rcutree.h
index 3cf71ce206e,1224d4c0538..7576fd4d8ce
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@@ -196,13 -196,6 +196,7 @@@ struct rcu_node 
  				/* Refused to boost: not sure why, though. */
  				/*  This can happen due to race conditions. */
  #endif /* #ifdef CONFIG_RCU_BOOST */
- 	struct task_struct *node_kthread_task;
- 				/* kthread that takes care of this rcu_node */
- 				/*  structure, for example, awakening the */
- 				/*  per-CPU kthreads as needed. */
- 	unsigned int node_kthread_status;
- 				/* State of node_kthread_task for tracing. */
 +	raw_spinlock_t fqslock ____cacheline_internodealigned_in_smp;
  } ____cacheline_internodealigned_in_smp;
  
  /*
diff --cc kernel/rcutree_plugin.h
index 46d7d6cf16d,c1961aed121..9c71c1b18e0
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@@ -25,7 -25,7 +25,8 @@@
   */
  
  #include <linux/delay.h>
 +#include <linux/oom.h>
+ #include <linux/smpboot.h>
  
  #define RCU_KTHREAD_PRIO 1