diff options
author | Joe Lawrence <joe.lawrence@redhat.com> | 2017-10-13 15:08:42 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-10-19 04:09:01 -0400 |
commit | 6116c3033a761611b1da980ea664c6ddff3eaed6 (patch) | |
tree | 63ca1776a39fb3becbda997f914cbd6444136728 | |
parent | 93862e385ded7c60351e09fcd2a541d273650905 (diff) |
livepatch: move transition "complete" notice into klp_complete_transition()
klp_complete_transition() performs a bit of housework before a
transition to KLP_PATCHED or KLP_UNPATCHED is actually completed
(including post-(un)patch callbacks). To be consistent, move the
transition "complete" kernel log notice out of
klp_try_complete_transition() and into klp_complete_transition().
Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | kernel/livepatch/transition.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c index 7bf55b7f3687..53887f0bca10 100644 --- a/kernel/livepatch/transition.c +++ b/kernel/livepatch/transition.c | |||
@@ -136,6 +136,9 @@ done: | |||
136 | klp_post_unpatch_callback(obj); | 136 | klp_post_unpatch_callback(obj); |
137 | } | 137 | } |
138 | 138 | ||
139 | pr_notice("'%s': %s complete\n", klp_transition_patch->mod->name, | ||
140 | klp_target_state == KLP_PATCHED ? "patching" : "unpatching"); | ||
141 | |||
139 | /* | 142 | /* |
140 | * See complementary comment in __klp_enable_patch() for why we | 143 | * See complementary comment in __klp_enable_patch() for why we |
141 | * keep the module reference for immediate patches. | 144 | * keep the module reference for immediate patches. |
@@ -423,9 +426,6 @@ void klp_try_complete_transition(void) | |||
423 | } | 426 | } |
424 | 427 | ||
425 | success: | 428 | success: |
426 | pr_notice("'%s': %s complete\n", klp_transition_patch->mod->name, | ||
427 | klp_target_state == KLP_PATCHED ? "patching" : "unpatching"); | ||
428 | |||
429 | /* we're done, now cleanup the data structures */ | 429 | /* we're done, now cleanup the data structures */ |
430 | klp_complete_transition(); | 430 | klp_complete_transition(); |
431 | } | 431 | } |