Skip to content

Commit 83da8ac

Browse files
rafaeljwgregkh
authored andcommitted
Revert "select: use freezable blocking call"
commit 59612d1 upstream. This reverts commit 9745cdb (select: use freezable blocking call) that triggers problems during resume from suspend to RAM on Paul Bolle's 32-bit x86 machines. Paul says: Ever since I tried running (release candidates of) v3.11 on the two working i686s I still have lying around I ran into issues on resuming from suspend. Reverting 9745cdb (select: use freezable blocking call) resolves those issues. Resuming from suspend on i686 on (release candidates of) v3.11 and later triggers issues like: traps: systemd[1] general protection ip:b738e490 sp:bf882fc0 error:0 in libc-2.16.so[b731c000+1b0000] and traps: rtkit-daemon[552] general protection ip:804d6e5 sp:b6cb32f0 error:0 in rtkit-daemon[8048000+d000] Once I hit the systemd error I can only get out of the mess that the system is at that point by power cycling it. Since we are reverting another freezer-related change causing similar problems to happen, this one should be reverted as well. References: https://lkml.org/lkml/2013/10/29/583 Reported-by: Paul Bolle <[email protected]> Fixes: 9745cdb (select: use freezable blocking call) Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7668bd8 commit 83da8ac

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

fs/select.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ int poll_schedule_timeout(struct poll_wqueues *pwq, int state,
238238

239239
set_current_state(state);
240240
if (!pwq->triggered)
241-
rc = freezable_schedule_hrtimeout_range(expires, slack,
242-
HRTIMER_MODE_ABS);
241+
rc = schedule_hrtimeout_range(expires, slack, HRTIMER_MODE_ABS);
243242
__set_current_state(TASK_RUNNING);
244243

245244
/*

0 commit comments

Comments
 (0)