diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 12:55:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 12:55:17 +0200 |
| commit | 71e69d7adee10a55b817df748dec5bfec7bf4c30 (patch) | |
| tree | ac342851e20df5a5f7891cc603998b654d26724c /kernel/tracepoint.c | |
| parent | 03b1292d1c0ea195e025e667555d74db7da82026 (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
Merge 5.14-rc3 into char-misc-next
We need the char-misc fixes from 5.14-rc3 into here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/tracepoint.c')
| -rw-r--r-- | kernel/tracepoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 976bf8ce8039..fc32821f8240 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -299,8 +299,8 @@ static int tracepoint_add_func(struct tracepoint *tp, * a pointer to it. This array is referenced by __DO_TRACE from * include/linux/tracepoint.h using rcu_dereference_sched(). */ - rcu_assign_pointer(tp->funcs, tp_funcs); tracepoint_update_call(tp, tp_funcs, false); + rcu_assign_pointer(tp->funcs, tp_funcs); static_key_enable(&tp->key); release_probes(old); |