diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 17:15:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 17:15:30 -0800 |
| commit | 4b5f9254e4f4375ac845cb17f1732037dd8adeeb (patch) | |
| tree | 92b5ad44c123b6dbd53e424292de0851b795fc5a /include | |
| parent | Merge branch 'userns-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace (diff) | |
| parent | kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE (diff) | |
| download | wireguard-linux-4b5f9254e4f4375ac845cb17f1732037dd8adeeb.tar.xz wireguard-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 'include')
| -rw-r--r-- | include/linux/eventpoll.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index 0350393465d4..593322c946e6 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -18,7 +18,7 @@ struct file; #ifdef CONFIG_EPOLL -#ifdef CONFIG_CHECKPOINT_RESTORE +#ifdef CONFIG_KCMP struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff); #endif |