From ebc7af30ceaca5d075f68d54aaa71989f87cccf3 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 12 Oct 2022 11:58:28 +0200
Subject: [PATCH] Revert "ANDROID: fs: epoll: use freezable blocking call"

This reverts commit e2db2cceeb223443022ee44001768d8aed273f52.

It causes a build error in 6.1-rc1 as the function being called is no
longer in the kernel tree at all.  If this is still needed for 6.1, it
can come back in a workable form.

Bug: 77139736
Bug: 120440023
Cc: Colin Cross <ccross@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I58cee0c364a54e2662efa73e084261a2490f13ba
---
 fs/eventpoll.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index e7a66cf160ea..8b56b94e2f56 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -29,7 +29,6 @@
 #include <linux/mutex.h>
 #include <linux/anon_inodes.h>
 #include <linux/device.h>
-#include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <asm/io.h>
 #include <asm/mman.h>
@@ -1876,8 +1875,8 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
 		write_unlock_irq(&ep->lock);
 
 		if (!eavail)
-			timed_out = !freezable_schedule_hrtimeout_range(to, slack,
-									HRTIMER_MODE_ABS);
+			timed_out = !schedule_hrtimeout_range(to, slack,
+							      HRTIMER_MODE_ABS);
 		__set_current_state(TASK_RUNNING);
 
 		/*