Merge branch 'for-5.18/selftests-fixes' into for-linus

diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c
index 5683ac0..77ef45a 100644 (file)
--- a/kernel/livepatch/transition.c
+++ b/kernel/livepatch/transition.c
@@ -641,6 +641,13 @@ void klp_force_transition(void)
        for_each_possible_cpu(cpu)
                klp_update_patch_state(idle_task(cpu));
 
-       klp_for_each_patch(patch)
-               patch->forced = true;
+       /* Set forced flag for patches being removed. */
+       if (klp_target_state == KLP_UNPATCHED)
+               klp_transition_patch->forced = true;
+       else if (klp_transition_patch->replace) {
+               klp_for_each_patch(patch) {
+                       if (patch != klp_transition_patch)
+                               patch->forced = true;
+               }
+       }
 }