Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / kernel / notifier.c

diff --git a/kernel/notifier.c b/kernel/notifier.c
index 980e433..fd2c9ac 100644 (file)
--- 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);
 }