diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index c9c76b4401774477f4c2613837fed563d12acd46..b46ef236424d3d567439e783d8047611efd02a1c 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -122,10 +122,7 @@ static int klp_find_object_module(struct klp_object *obj) * until mod->exit() finishes. This is especially important for * patches that modify semantic of the functions. */ -#ifdef CONFIG_LIVEPATCH_FTRACE - if (mod && mod->klp_alive) - obj->mod = mod; -#else +#ifdef CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY if (!mod) { pr_err("module '%s' not loaded\n", obj->name); mutex_unlock(&module_mutex); @@ -138,6 +135,9 @@ static int klp_find_object_module(struct klp_object *obj) } obj->mod = mod; +#else + if (mod && mod->klp_alive) + obj->mod = mod; #endif mutex_unlock(&module_mutex);