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

[firefly-linux-kernel-4.4.55.git] / kernel / events / callchain.c

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index c4f63e68a35cd877d6932ce43d36a6d5c68d662c..d659487254d5d77de07f279ceb0ba0bebe93ed03 100644 (file)
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -52,7 +52,7 @@ static void release_callchain_buffers(void)
        struct callchain_cpus_entries *entries;
 
        entries = callchain_cpus_entries;
-       rcu_assign_pointer(callchain_cpus_entries, NULL);
+       RCU_INIT_POINTER(callchain_cpus_entries, NULL);
        call_rcu(&entries->rcu_head, release_callchain_buffers_rcu);
 }