diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-01-31 18:33:52 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-01-31 18:36:38 +0300 |
| commit | d05b695c25bf0d704c74e0e1375de893531b9424 (patch) | |
| tree | 793ac54576aa7f8316579aa0123a3879273193cd /include/linux/livepatch.h | |
| parent | 8869016d3a58cbe7c31c70f4f008a92122b271c7 (diff) | |
| parent | d0807da78e11d46f18399cbf8c4028c731346766 (diff) | |
| download | linux-d05b695c25bf0d704c74e0e1375de893531b9424.tar.xz | |
Merge branch 'for-4.16/remove-immediate' into for-linus
Pull 'immediate' feature removal from Miroslav Benes.
Diffstat (limited to 'include/linux/livepatch.h')
| -rw-r--r-- | include/linux/livepatch.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h index fc5c1be3f6f4..4754f01c1abb 100644 --- a/include/linux/livepatch.h +++ b/include/linux/livepatch.h @@ -40,7 +40,6 @@ * @new_func: pointer to the patched function code * @old_sympos: a hint indicating which symbol position the old function * can be found (optional) - * @immediate: patch the func immediately, bypassing safety mechanisms * @old_addr: the address of the function being patched * @kobj: kobject for sysfs resources * @stack_node: list node for klp_ops func_stack list @@ -76,7 +75,6 @@ struct klp_func { * in kallsyms for the given object is used. */ unsigned long old_sympos; - bool immediate; /* internal */ unsigned long old_addr; @@ -137,7 +135,6 @@ struct klp_object { * struct klp_patch - patch structure for live patching * @mod: reference to the live patch module * @objs: object entries for kernel objects to be patched - * @immediate: patch all funcs immediately, bypassing safety mechanisms * @list: list node for global list of registered patches * @kobj: kobject for sysfs resources * @enabled: the patch is enabled (but operation may be incomplete) @@ -147,7 +144,6 @@ struct klp_patch { /* external */ struct module *mod; struct klp_object *objs; - bool immediate; /* internal */ struct list_head list; |