diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2018-01-31 16:33:52 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-01-31 16:36:38 +0100 |
| commit | d05b695c25bf0d704c74e0e1375de893531b9424 (patch) | |
| tree | 793ac54576aa7f8316579aa0123a3879273193cd /kernel/livepatch/core.c | |
| parent | livepatch: add locking to force and signal functions (diff) | |
| parent | livepatch: Remove immediate feature (diff) | |
| download | wireguard-linux-d05b695c25bf0d704c74e0e1375de893531b9424.tar.xz wireguard-linux-d05b695c25bf0d704c74e0e1375de893531b9424.zip | |
Merge branch 'for-4.16/remove-immediate' into for-linus
Pull 'immediate' feature removal from Miroslav Benes.
Diffstat (limited to 'kernel/livepatch/core.c')
| -rw-r--r-- | kernel/livepatch/core.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 8fd8e8f126da..3a4656fb7047 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -366,11 +366,6 @@ static int __klp_enable_patch(struct klp_patch *patch) /* * A reference is taken on the patch module to prevent it from being * unloaded. - * - * Note: For immediate (no consistency model) patches we don't allow - * patch modules to unload since there is no safe/sane method to - * determine if a thread is still running in the patched code contained - * in the patch module once the ftrace registration is successful. */ if (!try_module_get(patch->mod)) return -ENODEV; @@ -894,12 +889,7 @@ int klp_register_patch(struct klp_patch *patch) if (!klp_initialized()) return -ENODEV; - /* - * Architectures without reliable stack traces have to set - * patch->immediate because there's currently no way to patch kthreads - * with the consistency model. - */ - if (!klp_have_reliable_stack() && !patch->immediate) { + if (!klp_have_reliable_stack()) { pr_err("This architecture doesn't have support for the livepatch consistency model.\n"); return -ENOSYS; } |