From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 23 Oct 2012 22:13:49 +0000 (-0700)
Subject: Merge branch 'idle.2012.10.23c' into dev.3.8.2012.10.23d
X-Git-Tag: next-20121024~29^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec97d8cc8d0063d5ab3ab2db225b844b62f440cd;p=karo-tx-linux.git

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

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

ec97d8cc8d0063d5ab3ab2db225b844b62f440cd
diff --cc kernel/rcu.h
index a88fa9f71b27,20dfba576c2b..7ff057d7063d
--- a/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/rcutree.c
index 027153cfa1f4,effd47a54b36..8615c9f4c2ee
--- a/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;
  		}