1 files changed, 26 insertions, 5 deletions

diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c
index 0ff466ab4b5a..99cb3ad05eb4 100644
--- a/kernel/livepatch/patch.c
+++ b/kernel/livepatch/patch.c
@@ -246,15 +246,26 @@ err:
         return ret;
 }
 
-void klp_unpatch_object(struct klp_object *obj)
+static void __klp_unpatch_object(struct klp_object *obj, bool nops_only)
 {
         struct klp_func *func;
 
-        klp_for_each_func(obj, func)
+        klp_for_each_func(obj, func) {
+                if (nops_only && !func->nop)
+                        continue;
+
                 if (func->patched)
                         klp_unpatch_func(func);
+        }
 
-        obj->patched = false;
+        if (obj->dynamic || !nops_only)
+                obj->patched = false;
+}
+
+
+void klp_unpatch_object(struct klp_object *obj)
+{
+        __klp_unpatch_object(obj, false);
 }
 
 int klp_patch_object(struct klp_object *obj)
@@ -277,11 +288,21 @@ int klp_patch_object(struct klp_object *obj)
         return 0;
 }
 
-void klp_unpatch_objects(struct klp_patch *patch)
+static void __klp_unpatch_objects(struct klp_patch *patch, bool nops_only)
 {
         struct klp_object *obj;
 
         klp_for_each_object(patch, obj)
                 if (obj->patched)
-                        klp_unpatch_object(obj);
+                        __klp_unpatch_object(obj, nops_only);
+}
+
+void klp_unpatch_objects(struct klp_patch *patch)
+{
+        __klp_unpatch_objects(patch, false);
+}
+
+void klp_unpatch_objects_dynamic(struct klp_patch *patch)
+{
+        __klp_unpatch_objects(patch, true);
 }