diff options
| author | Jiri Kosina <[email protected]> | 2017-11-15 10:53:24 +0100 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2017-11-15 10:54:27 +0100 |
| commit | fc41efc1843009ebcdb4850b21f1c371ad203f4e (patch) | |
| tree | 71878da67ed83e19ba6d5e30ebee72e6d3612760 /samples/livepatch/Makefile | |
| parent | cb65dc7b89043a66d4459a6a811645d43185b5f0 (diff) | |
| parent | 89a9a1c1c89cea5f70975c338c011b9f7024dee5 (diff) | |
Merge branch 'for-4.15/callbacks' into for-linus
This pulls in an infrastructure/API that allows livepatch writers to
register pre-patch and post-patch callbacks that allow for running a
glue code necessary for finalizing the patching if necessary.
Conflicts:
kernel/livepatch/core.c
- trivial conflict by adding a callback call into
module going notifier vs. moving that code block
to klp_cleanup_module_patches_limited()
Signed-off-by: Jiri Kosina <[email protected]>
Diffstat (limited to 'samples/livepatch/Makefile')
| -rw-r--r-- | samples/livepatch/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/samples/livepatch/Makefile b/samples/livepatch/Makefile index 539e81d433cd..2472ce39a18d 100644 --- a/samples/livepatch/Makefile +++ b/samples/livepatch/Makefile @@ -2,3 +2,6 @@ obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-sample.o obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-mod.o obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-fix1.o obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-fix2.o +obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-callbacks-demo.o +obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-callbacks-mod.o +obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-callbacks-busymod.o |