diff --git a/[refs] b/[refs] index e77fffa6ea56..72c9a2f215ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 387ef4e24af4ae43a7961ba6eec749488da99535 +refs/heads/master: 326f418b4c74ab4a6066f38b6144bc6461f9447b diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h index bd96ecd0e05c..802de56c41e8 100644 --- a/trunk/include/linux/tracepoint.h +++ b/trunk/include/linux/tracepoint.h @@ -153,7 +153,7 @@ static inline void tracepoint_synchronize_unregister(void) } \ static inline void trace_##name##_rcuidle(proto) \ { \ - if (static_branch(&__tracepoint_##name.key)) \ + if (static_key_false(&__tracepoint_##name.key)) \ __DO_TRACE(&__tracepoint_##name, \ TP_PROTO(data_proto), \ TP_ARGS(data_args), \