Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b
Paul E. McKenney [Tue, 25 Sep 2012 17:01:45 +0000 (10:01 -0700)]
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.

1  2 
kernel/rcutree.c
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/rcutree_trace.c

Simple merge
@@@ -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;
  
  /*
@@@ -25,7 -25,7 +25,8 @@@
   */
  
  #include <linux/delay.h>
 +#include <linux/oom.h>
+ #include <linux/smpboot.h>
  
  #define RCU_KTHREAD_PRIO 1
  
Simple merge