diff options
| author | Linus Torvalds | 2021-02-22 17:15:30 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2021-02-22 17:15:30 -0800 |
| commit | 4b5f9254e4f4375ac845cb17f1732037dd8adeeb (patch) | |
| tree | 92b5ad44c123b6dbd53e424292de0851b795fc5a /tools/testing | |
| parent | 7b0b78df9cca7344960decf3a16805e8378a43b7 (diff) | |
| parent | bfe3911a91047557eb0e620f95a370aee6a248c7 (diff) | |
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 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 9338df6f4ca8..98c3b647f54d 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -315,7 +315,7 @@ TEST(kcmp) ret = __filecmp(getpid(), getpid(), 1, 1); EXPECT_EQ(ret, 0); if (ret != 0 && errno == ENOSYS) - SKIP(return, "Kernel does not support kcmp() (missing CONFIG_CHECKPOINT_RESTORE?)"); + SKIP(return, "Kernel does not support kcmp() (missing CONFIG_KCMP?)"); } TEST(mode_strict_support) |