Commit c511851d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Revert "epoll: use freezable blocking call"

This reverts commit 1c441e92 (epoll: use freezable blocking call)
which is reported to cause user space memory corruption to happen
after suspend to RAM.

Since it appears to be extremely difficult to root cause this
problem, it is best to revert the offending commit and try to address
the original issue in a better way later.

References: https://bugzilla.kernel.org/show_bug.cgi?id=61781Reported-by: default avatarNatrio <natrio@list.ru>
Reported-by: default avatarJeff Pohlmeyer <yetanothergeek@gmail.com>
Bisected-by: default avatarLeo Wolf <jclw@ymail.com>
Fixes: 1c441e92 (epoll: use freezable blocking call)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.11+ <stable@vger.kernel.org> # 3.11+
parent 959f5854
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/anon_inodes.h> #include <linux/anon_inodes.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/freezer.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mman.h> #include <asm/mman.h>
...@@ -1605,8 +1604,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, ...@@ -1605,8 +1604,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
} }
spin_unlock_irqrestore(&ep->lock, flags); spin_unlock_irqrestore(&ep->lock, flags);
if (!freezable_schedule_hrtimeout_range(to, slack, if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS))
HRTIMER_MODE_ABS))
timed_out = 1; timed_out = 1;
spin_lock_irqsave(&ep->lock, flags); spin_lock_irqsave(&ep->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment