NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit e2db2cceeb.

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
This commit is contained in:
Greg Kroah-Hartman 2022-10-12 11:58:28 +02:00
parent 5f6408c759
commit ebc7af30ce
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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>
@ -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);
/*