aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Lawrence <[email protected]>2017-10-13 15:08:42 -0400
committerJiri Kosina <[email protected]>2017-10-19 10:09:01 +0200
commit6116c3033a761611b1da980ea664c6ddff3eaed6 (patch)
tree63ca1776a39fb3becbda997f914cbd6444136728
parent93862e385ded7c60351e09fcd2a541d273650905 (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 <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Signed-off-by: Joe Lawrence <[email protected]> Acked-by: Miroslav Benes <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
-rw-r--r--kernel/livepatch/transition.c6
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:
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();
}