diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 13:07:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 13:07:49 -0700 |
| commit | 8c06da67d0bd3139a97f301b4aa9c482b9d4f29e (patch) | |
| tree | 6668124d777892d60be186304aea25d77cfc6ef9 /kernel/livepatch/patch.c | |
| parent | Merge tag 'printk-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | livepatch: Rename KLP_* to KLP_TRANSITION_* (diff) | |
| download | linux-8c06da67d0bd3139a97f301b4aa9c482b9d4f29e.tar.gz linux-8c06da67d0bd3139a97f301b4aa9c482b9d4f29e.zip | |
Merge tag 'livepatching-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching update from Petr Mladek:
- Use more informative names for the livepatch transition states
* tag 'livepatching-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
livepatch: Rename KLP_* to KLP_TRANSITION_*
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 4152c71507e2..90408500e5a3 100644 --- a/kernel/livepatch/patch.c +++ b/kernel/livepatch/patch.c @@ -95,9 +95,9 @@ static void notrace klp_ftrace_handler(unsigned long ip, patch_state = current->patch_state; - WARN_ON_ONCE(patch_state == KLP_UNDEFINED); + WARN_ON_ONCE(patch_state == KLP_TRANSITION_IDLE); - if (patch_state == KLP_UNPATCHED) { + if (patch_state == KLP_TRANSITION_UNPATCHED) { /* * Use the previously patched version of the function. * If no previous patches exist, continue with the |