|
 |
dbd4557 |
From c511851de162e8ec03d62e7d7feecbdf590d881d Mon Sep 17 00:00:00 2001
|
|
|
dbd4557 |
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
|
|
|
dbd4557 |
Date: Tue, 29 Oct 2013 13:12:56 +0100
|
|
|
dbd4557 |
Subject: [PATCH] Revert "epoll: use freezable blocking call"
|
|
|
dbd4557 |
|
|
|
dbd4557 |
This reverts commit 1c441e921201 (epoll: use freezable blocking call)
|
|
|
dbd4557 |
which is reported to cause user space memory corruption to happen
|
|
|
dbd4557 |
after suspend to RAM.
|
|
|
dbd4557 |
|
|
|
dbd4557 |
Since it appears to be extremely difficult to root cause this
|
|
|
dbd4557 |
problem, it is best to revert the offending commit and try to address
|
|
|
dbd4557 |
the original issue in a better way later.
|
|
|
dbd4557 |
|
|
|
dbd4557 |
References: https://bugzilla.kernel.org/show_bug.cgi?id=61781
|
|
|
dbd4557 |
Reported-by: Natrio <natrio@list.ru>
|
|
|
dbd4557 |
Reported-by: Jeff Pohlmeyer <yetanothergeek@gmail.com>
|
|
|
dbd4557 |
Bisected-by: Leo Wolf <jclw@ymail.com>
|
|
|
dbd4557 |
Fixes: 1c441e921201 (epoll: use freezable blocking call)
|
|
|
dbd4557 |
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
|
dbd4557 |
Cc: 3.11+ <stable@vger.kernel.org> # 3.11+
|
|
|
dbd4557 |
---
|
|
|
dbd4557 |
fs/eventpoll.c | 4 +---
|
|
|
dbd4557 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
dbd4557 |
|
|
|
dbd4557 |
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
|
|
|
dbd4557 |
index 473e09d..810c28f 100644
|
|
|
dbd4557 |
--- a/fs/eventpoll.c
|
|
|
dbd4557 |
+++ b/fs/eventpoll.c
|
|
|
dbd4557 |
@@ -34,7 +34,6 @@
|
|
|
dbd4557 |
#include <linux/mutex.h>
|
|
|
dbd4557 |
#include <linux/anon_inodes.h>
|
|
|
dbd4557 |
#include <linux/device.h>
|
|
|
dbd4557 |
-#include <linux/freezer.h>
|
|
|
dbd4557 |
#include <asm/uaccess.h>
|
|
|
dbd4557 |
#include <asm/io.h>
|
|
|
dbd4557 |
#include <asm/mman.h>
|
|
|
dbd4557 |
@@ -1605,8 +1604,7 @@ fetch_events:
|
|
|
dbd4557 |
}
|
|
|
dbd4557 |
|
|
|
dbd4557 |
spin_unlock_irqrestore(&ep->lock, flags);
|
|
|
dbd4557 |
- if (!freezable_schedule_hrtimeout_range(to, slack,
|
|
|
dbd4557 |
- HRTIMER_MODE_ABS))
|
|
|
dbd4557 |
+ if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS))
|
|
|
dbd4557 |
timed_out = 1;
|
|
|
dbd4557 |
|
|
|
dbd4557 |
spin_lock_irqsave(&ep->lock, flags);
|
|
|
dbd4557 |
--
|
|
|
dbd4557 |
1.8.3.1
|
|
|
dbd4557 |
|