kcmp syscall is build iif CONFIG_CHECKPOINT_RESTORE is selected,
so wrap appropriate helpers in epoll code with the config to
build it conditionally.
Signed-off-by: Cyrill Gorcunov <gorcu...@openvz.org>
Reported-by: Andrew Morton <a...@linuxfoundation.org>
CC: Andrey Vagin <ava...@openvz.org>
CC: Al Viro <v...@zeniv.linux.org.uk>
CC: Pavel Emelyanov <xe...@virtuozzo.com>
CC: Michael Kerrisk <mtk.manpa...@gmail.com>
CC: Jason Baron <jba...@akamai.com>
CC: Andy Lutomirski <l...@amacapital.net>
---
fs/eventpoll.c | 2 ++
include/linux/eventpoll.h | 2 ++
2 files changed, 4 insertions(+)
Index: linux-ml.git/fs/eventpoll.c
===================================================================
--- linux-ml.git.orig/fs/eventpoll.c
+++ linux-ml.git/fs/eventpoll.c
@@ -1077,6 +1077,7 @@ static struct epitem *ep_find(struct eve
return epir;
}
+#ifdef CONFIG_CHECKPOINT_RESTORE
static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long
toff)
{
struct rb_node *rbp;
@@ -1118,6 +1119,7 @@ struct file *get_epoll_tfile_raw_ptr(str
return file_raw;
}
+#endif /* CONFIG_CHECKPOINT_RESTORE */
/*
* This is the callback that is passed to the wait queue wakeup
Index: linux-ml.git/include/linux/eventpoll.h
===================================================================
--- linux-ml.git.orig/include/linux/eventpoll.h
+++ linux-ml.git/include/linux/eventpoll.h
@@ -23,7 +23,9 @@ struct file;
#ifdef CONFIG_EPOLL
+#ifdef CONFIG_CHECKPOINT_RESTORE
struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long
toff);
+#endif
/* Used to initialize the epoll bits inside the "struct file" */
static inline void eventpoll_init_file(struct file *file)
