From: Joe Lawrence Date: Fri, 13 Oct 2017 19:08:42 +0000 (-0400) Subject: livepatch: move transition "complete" notice into klp_complete_transition() X-Git-Tag: v4.15-rc1~112^2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6116c3033a761611b1da980ea664c6ddff3eaed6;p=thirdparty%2Fkernel%2Flinux.git 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 Acked-by: Josh Poimboeuf Signed-off-by: Joe Lawrence Acked-by: Miroslav Benes Reviewed-by: Petr Mladek Signed-off-by: Jiri Kosina --- diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c index 7bf55b7f36875..53887f0bca102 100644 --- a/kernel/livepatch/transition.c +++ b/kernel/livepatch/transition.c @@ -136,6 +136,9 @@ done: klp_post_unpatch_callback(obj); } + pr_notice("'%s': %s complete\n", klp_transition_patch->mod->name, + klp_target_state == KLP_PATCHED ? "patching" : "unpatching"); + /* * See complementary comment in __klp_enable_patch() for why we * keep the module reference for immediate patches. @@ -423,9 +426,6 @@ void klp_try_complete_transition(void) } success: - pr_notice("'%s': %s complete\n", klp_transition_patch->mod->name, - klp_target_state == KLP_PATCHED ? "patching" : "unpatching"); - /* we're done, now cleanup the data structures */ klp_complete_transition(); }