diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:43:37 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:43:37 (GMT) |
commit | ecf1f014325ba60f4df35edae1a357c67c5d4eb1 (patch) | |
tree | 38786562c25d738bed0e22ed8d615e5a7b27c0c7 /kernel/lockdep.c | |
parent | 97c53b402fcadb50201c23914f614bf8430d9c20 (diff) | |
parent | 0e95c69bde1a5bf22acd53b356fe10d7bec6e2be (diff) | |
download | linux-ecf1f014325ba60f4df35edae1a357c67c5d4eb1.tar.xz |
Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ file move
There are conflicts in lockdep.c due to RCU changes, and also the RCU
tree changes kernel/Makefile - so pre-merge it to ease the moving of
locking related .c files to kernel/locking/.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/lockdep.c')
-rw-r--r-- | kernel/lockdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index e16c45b..4e8e14c 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -4224,7 +4224,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) printk("\n%srcu_scheduler_active = %d, debug_locks = %d\n", !rcu_lockdep_current_cpu_online() ? "RCU used illegally from offline CPU!\n" - : rcu_is_cpu_idle() + : !rcu_is_watching() ? "RCU used illegally from idle CPU!\n" : "", rcu_scheduler_active, debug_locks); @@ -4247,7 +4247,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s) * So complain bitterly if someone does call rcu_read_lock(), * rcu_read_lock_bh() and so on from extended quiescent states. */ - if (rcu_is_cpu_idle()) + if (!rcu_is_watching()) printk("RCU used illegally from extended quiescent state!\n"); lockdep_print_held_locks(curr); |