Merge branch 'idle.2012.10.23c' into dev.3.8.2012.10.23d

Resolved adjacent-change conflicts for:
	kernel/rcu.h
	kernel/rcutree.c

diff --cc include/linux/rcupdate.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/rcu.h
index a88fa9f71b27c0690fa20b2aa3de26b243677a58,20dfba576c2b7efde60815321b5dce1c7e049e37..7ff057d7063d559274c415464f713f0abb33bfae
--- 1/kernel/rcu.h
--- 2/kernel/rcu.h
+++ b/kernel/rcu.h
@@@ -109,11 -109,6 +109,13 @@@ static inline bool __rcu_reclaim(char *
        }
  }
  
+ extern int rcu_expedited;
+ 
 +#if defined(CONFIG_SMP) || defined(CONFIG_RCU_TRACE)
 +
 +extern int rcu_cpu_stall_suppress;
 +int rcu_jiffies_till_stall_check(void);
 +
 +#endif /* defined(CONFIG_SMP) || defined(CONFIG_RCU_TRACE) */
 +
  #endif /* __LINUX_RCU_H */

diff --cc kernel/rcupdate.c
Simple merge

diff --cc kernel/rcutiny_plugin.h
Simple merge

diff --cc kernel/rcutree.c
index 027153cfa1f44bf37d903a3050d582ee80dc9b06,effd47a54b361fe8839933b4b4586ef7f7a68455..8615c9f4c2ee210cb6ee5480c7298024a017bbe0
--- 1/kernel/rcutree.c
--- 2/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@@ -2389,8 -2334,7 +2395,8 @@@ void synchronize_sched_expedited(void
                if (trycount++ < 10) {
                        udelay(trycount * num_online_cpus());
                } else {
-                       synchronize_sched();
+                       wait_rcu_gp(call_rcu_sched);
 +                      atomic_long_inc(&rsp->expedited_normal);
                        return;
                }
  

diff --cc kernel/rcutree_plugin.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/srcu.c
Simple merge