diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-09-13 10:01:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-13 10:01:24 +0200 |
| commit | c7ef92cea98bc468bbc8e67b6e49d7365dc69482 (patch) | |
| tree | 1ed0118f697d72103eaf8fa53bd373be7a1c91ff /kernel/notifier.c | |
| parent | locking/qspinlock/x86: Only emit the test-and-set fallback when building guest support (diff) | |
| parent | Linux 4.3-rc1 (diff) | |
Merge tag 'v4.3-rc1' into locking/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/notifier.c')
| -rw-r--r-- | kernel/notifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/notifier.c b/kernel/notifier.c index 980e4330fb59..fd2c9acbcc19 100644 --- a/kernel/notifier.c +++ b/kernel/notifier.c @@ -544,7 +544,7 @@ int notrace notify_die(enum die_val val, const char *str, .signr = sig, }; - rcu_lockdep_assert(rcu_is_watching(), + RCU_LOCKDEP_WARN(!rcu_is_watching(), "notify_die called but RCU thinks we're quiescent"); return atomic_notifier_call_chain(&die_chain, val, &args); } |