From bebd4f59dff203e69386f832abbde4cb7f7fc1d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Mon, 21 Dec 2020 12:40:27 +0100 Subject: [PATCH] kdbus: Revert "fs: unexport poll_schedule_timeout" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 8f546ae1fc5ce8396827d4868c7eee1f1cc6947a. Change-Id: I5429471eeb092c55a50e37c0b642d50d69daebc7 Signed-off-by: Łukasz Stelmach --- fs/select.c | 3 ++- include/linux/poll.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/select.c b/fs/select.c index 5edffee..8b99c4d 100644 --- a/fs/select.c +++ b/fs/select.c @@ -233,7 +233,7 @@ static void __pollwait(struct file *filp, wait_queue_head_t *wait_address, add_wait_queue(wait_address, &entry->wait); } -static int poll_schedule_timeout(struct poll_wqueues *pwq, int state, +int poll_schedule_timeout(struct poll_wqueues *pwq, int state, ktime_t *expires, unsigned long slack) { int rc = -EINTR; @@ -258,6 +258,7 @@ static int poll_schedule_timeout(struct poll_wqueues *pwq, int state, return rc; } +EXPORT_SYMBOL(poll_schedule_timeout); /** * poll_select_set_timeout - helper function to setup the timeout value diff --git a/include/linux/poll.h b/include/linux/poll.h index 1cdc32b..02ff7ee 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -112,6 +112,8 @@ struct poll_wqueues { extern void poll_initwait(struct poll_wqueues *pwq); extern void poll_freewait(struct poll_wqueues *pwq); +extern int poll_schedule_timeout(struct poll_wqueues *pwq, int state, + ktime_t *expires, unsigned long slack); extern u64 select_estimate_accuracy(struct timespec64 *tv); #define MAX_INT64_SECONDS (((s64)(~((u64)0)>>1)/HZ)-1) -- 2.7.4