summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 17:15:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 17:15:30 -0800
commit4b5f9254e4f4375ac845cb17f1732037dd8adeeb (patch)
tree92b5ad44c123b6dbd53e424292de0851b795fc5a /kernel
parent7b0b78df9cca7344960decf3a16805e8378a43b7 (diff)
parentbfe3911a91047557eb0e620f95a370aee6a248c7 (diff)
downloadlinux-4b5f9254e4f4375ac845cb17f1732037dd8adeeb.tar.gz
linux-4b5f9254e4f4375ac845cb17f1732037dd8adeeb.tar.bz2
linux-4b5f9254e4f4375ac845cb17f1732037dd8adeeb.zip
Merge tag 'topic/kcmp-kconfig-2021-02-22' of git://anongit.freedesktop.org/drm/drm
Pull kcmp kconfig update from Daniel Vetter: "Make the kcmp syscall available independently of checkpoint/restore. drm userspaces uses this, systemd uses this, so makes sense to pull it out from the checkpoint-restore bundle. Kees reviewed this from security pov and is happy with the final version" Link: https://lwn.net/Articles/845448/ * tag 'topic/kcmp-kconfig-2021-02-22' of git://anongit.freedesktop.org/drm/drm: kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index aa7368c7eabf..320f1f3941b7 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -51,7 +51,7 @@ obj-y += livepatch/
obj-y += dma/
obj-y += entry/
-obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
+obj-$(CONFIG_KCMP) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o