diff options
| author | Bartlomiej Zolnierkiewicz <[email protected]> | 2019-02-07 16:44:43 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <[email protected]> | 2019-02-07 16:44:43 +0100 |
| commit | 82ffd0454bd9bd57780966d47bfd56d579dd4fb3 (patch) | |
| tree | a735cfea934b7c4eac4a2c228cd95620c1daf969 /kernel/livepatch/patch.c | |
| parent | 890d14d2d4b57ff5a149309da3ed36c8a529987f (diff) | |
| parent | 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 (diff) | |
Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.0-rc5
Sync with upstream (which now contains fbdev-v5.0-rc3 changes) to
prepare a base for fbdev-v5.1 changes.
Diffstat (limited to 'kernel/livepatch/patch.c')
| -rw-r--r-- | kernel/livepatch/patch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c index 82d584225dc6..7702cb4064fc 100644 --- a/kernel/livepatch/patch.c +++ b/kernel/livepatch/patch.c @@ -61,7 +61,7 @@ static void notrace klp_ftrace_handler(unsigned long ip, ops = container_of(fops, struct klp_ops, fops); /* - * A variant of synchronize_sched() is used to allow patching functions + * A variant of synchronize_rcu() is used to allow patching functions * where RCU is not watching, see klp_synchronize_transition(). */ preempt_disable_notrace(); @@ -72,7 +72,7 @@ static void notrace klp_ftrace_handler(unsigned long ip, /* * func should never be NULL because preemption should be disabled here * and unregister_ftrace_function() does the equivalent of a - * synchronize_sched() before the func_stack removal. + * synchronize_rcu() before the func_stack removal. */ if (WARN_ON_ONCE(!func)) goto unlock; |