diff options
Diffstat (limited to 'kernel/tracepoint.c')
| -rw-r--r-- | kernel/tracepoint.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index f1539decd99d..d96ba22dabfa 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/jump_label.h> | 28 | #include <linux/static_key.h> |
| 29 | 29 | ||
| 30 | extern struct tracepoint * const __start___tracepoints_ptrs[]; | 30 | extern struct tracepoint * const __start___tracepoints_ptrs[]; |
| 31 | extern struct tracepoint * const __stop___tracepoints_ptrs[]; | 31 | extern struct tracepoint * const __stop___tracepoints_ptrs[]; |
| @@ -256,9 +256,9 @@ static void set_tracepoint(struct tracepoint_entry **entry, | |||
| 256 | { | 256 | { |
| 257 | WARN_ON(strcmp((*entry)->name, elem->name) != 0); | 257 | WARN_ON(strcmp((*entry)->name, elem->name) != 0); |
| 258 | 258 | ||
| 259 | if (elem->regfunc && !jump_label_enabled(&elem->key) && active) | 259 | if (elem->regfunc && !static_key_enabled(&elem->key) && active) |
| 260 | elem->regfunc(); | 260 | elem->regfunc(); |
| 261 | else if (elem->unregfunc && jump_label_enabled(&elem->key) && !active) | 261 | else if (elem->unregfunc && static_key_enabled(&elem->key) && !active) |
| 262 | elem->unregfunc(); | 262 | elem->unregfunc(); |
| 263 | 263 | ||
| 264 | /* | 264 | /* |
| @@ -269,10 +269,10 @@ static void set_tracepoint(struct tracepoint_entry **entry, | |||
| 269 | * is used. | 269 | * is used. |
| 270 | */ | 270 | */ |
| 271 | rcu_assign_pointer(elem->funcs, (*entry)->funcs); | 271 | rcu_assign_pointer(elem->funcs, (*entry)->funcs); |
| 272 | if (active && !jump_label_enabled(&elem->key)) | 272 | if (active && !static_key_enabled(&elem->key)) |
| 273 | jump_label_inc(&elem->key); | 273 | static_key_slow_inc(&elem->key); |
| 274 | else if (!active && jump_label_enabled(&elem->key)) | 274 | else if (!active && static_key_enabled(&elem->key)) |
| 275 | jump_label_dec(&elem->key); | 275 | static_key_slow_dec(&elem->key); |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | /* | 278 | /* |
| @@ -283,11 +283,11 @@ static void set_tracepoint(struct tracepoint_entry **entry, | |||
| 283 | */ | 283 | */ |
| 284 | static void disable_tracepoint(struct tracepoint *elem) | 284 | static void disable_tracepoint(struct tracepoint *elem) |
| 285 | { | 285 | { |
| 286 | if (elem->unregfunc && jump_label_enabled(&elem->key)) | 286 | if (elem->unregfunc && static_key_enabled(&elem->key)) |
| 287 | elem->unregfunc(); | 287 | elem->unregfunc(); |
| 288 | 288 | ||
| 289 | if (jump_label_enabled(&elem->key)) | 289 | if (static_key_enabled(&elem->key)) |
| 290 | jump_label_dec(&elem->key); | 290 | static_key_slow_dec(&elem->key); |
| 291 | rcu_assign_pointer(elem->funcs, NULL); | 291 | rcu_assign_pointer(elem->funcs, NULL); |
| 292 | } | 292 | } |
| 293 | 293 | ||
