diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
| commit | 0b37fbf7508ff30e1d3668fea74e82f842448354 (patch) | |
| tree | 6d01fee5e95e1d4a8042ef473d61dd816b43d13e /fs/select.c | |
| parent | 0a37d59e3c8c2299f8931df0cb1c0f525047fab5 (diff) | |
| parent | a88f9e27498afaea615ad3e93af4f26df1f84987 (diff) | |
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
kernel/futex.c
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/select.c b/fs/select.c index 8c1c96c2706..6b14dc7df3a 100644 --- a/fs/select.c +++ b/fs/select.c @@ -27,6 +27,7 @@ #include <linux/rcupdate.h> #include <linux/hrtimer.h> #include <linux/sched/rt.h> +#include <linux/freezer.h> #include <asm/uaccess.h> @@ -236,7 +237,8 @@ int poll_schedule_timeout(struct poll_wqueues *pwq, int state, set_current_state(state); if (!pwq->triggered) - rc = schedule_hrtimeout_range(expires, slack, HRTIMER_MODE_ABS); + rc = freezable_schedule_hrtimeout_range(expires, slack, + HRTIMER_MODE_ABS); __set_current_state(TASK_RUNNING); /* |