github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: fs: epoll: use freezable blocking call"

Browse Source 
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
This commit is contained in:
Greg Kroah-Hartman 2020-12-21 13:17:45 +01:00
parent 20aa838e04
commit d07b0181d6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/eventpoll.c
View File

@ -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 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *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;
}