From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2011 06:02:47 +0000 (+1000)
Subject: Merge remote-tracking branch 'rcu/rcu/next'
X-Git-Tag: next-20110905~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=797abb2d50f767e5cf1546c5d0bdbe5311fac83b;p=karo-tx-linux.git

Merge remote-tracking branch 'rcu/rcu/next'
---

797abb2d50f767e5cf1546c5d0bdbe5311fac83b
diff --cc kernel/sched.c
index ccacdbdecf45,313c0f63e29a..50e3f564d5b5
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -8217,8 -8185,10 +8207,9 @@@ static inline int preempt_count_equals(
  
  void __might_sleep(const char *file, int line, int preempt_offset)
  {
 -#ifdef in_atomic
  	static unsigned long prev_jiffy;	/* ratelimiting */
  
+ 	rcu_sleep_check(); /* WARN_ON_ONCE() by default, no rate limit reqd. */
  	if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) ||
  	    system_state != SYSTEM_RUNNING || oops_in_progress)
  		return;