From d07b0181d651bb5541f3160bb6bcc9227e388885 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Mon, 21 Dec 2020 13:17:45 +0100
Subject: [PATCH] Revert "ANDROID: fs: epoll: use freezable blocking call"

It causes big merge issues with a 5.11-rc1 merge point, so revert this
patch for now, hopefully we can add it back at a later point...

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

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 29d9e8657b5b..10b81e69db74 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>
@@ -1821,8 +1820,7 @@ fetch_events:
 		if (eavail || res)
 			break;
 
-		if (!freezable_schedule_hrtimeout_range(to, slack,
-						        HRTIMER_MODE_ABS)) {
+		if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS)) {
 			timed_out = 1;
 			break;
 		}