aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-29 08:12:56 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-30 10:27:53 -0400
commitc511851de162e8ec03d62e7d7feecbdf590d881d (patch)
tree007313f354f688036845ab39a67fe6a100b013fb /fs
parent959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff)
Revert "epoll: use freezable blocking call"
This reverts commit 1c441e921201 (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=61781 Reported-by: Natrio <natrio@list.ru> Reported-by: Jeff Pohlmeyer <yetanothergeek@gmail.com> Bisected-by: Leo Wolf <jclw@ymail.com> Fixes: 1c441e921201 (epoll: use freezable blocking call) Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: 3.11+ <stable@vger.kernel.org> # 3.11+
Diffstat (limited to 'fs')
-rw-r--r--fs/eventpoll.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 473e09da7d02..810c28fb8c3c 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -34,7 +34,6 @@
34#include <linux/mutex.h> 34#include <linux/mutex.h>
35#include <linux/anon_inodes.h> 35#include <linux/anon_inodes.h>
36#include <linux/device.h> 36#include <linux/device.h>
37#include <linux/freezer.h>
38#include <asm/uaccess.h> 37#include <asm/uaccess.h>
39#include <asm/io.h> 38#include <asm/io.h>
40#include <asm/mman.h> 39#include <asm/mman.h>
@@ -1605,8 +1604,7 @@ fetch_events:
1605 } 1604 }
1606 1605
1607 spin_unlock_irqrestore(&ep->lock, flags); 1606 spin_unlock_irqrestore(&ep->lock, flags);
1608 if (!freezable_schedule_hrtimeout_range(to, slack, 1607 if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS))
1609 HRTIMER_MODE_ABS))
1610 timed_out = 1; 1608 timed_out = 1;
1611 1609
1612 spin_lock_irqsave(&ep->lock, flags); 1610 spin_lock_irqsave(&ep->lock, flags);