diff options
-rw-r--r-- | kernel/timer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index f4152fcd9f8e..3ba10fa35b60 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1151,19 +1151,22 @@ fastcall signed long __sched schedule_timeout(signed long timeout) | |||
1151 | out: | 1151 | out: |
1152 | return timeout < 0 ? 0 : timeout; | 1152 | return timeout < 0 ? 0 : timeout; |
1153 | } | 1153 | } |
1154 | |||
1155 | EXPORT_SYMBOL(schedule_timeout); | 1154 | EXPORT_SYMBOL(schedule_timeout); |
1156 | 1155 | ||
1156 | /* | ||
1157 | * We can use __set_current_state() here because schedule_timeout() calls | ||
1158 | * schedule() unconditionally. | ||
1159 | */ | ||
1157 | signed long __sched schedule_timeout_interruptible(signed long timeout) | 1160 | signed long __sched schedule_timeout_interruptible(signed long timeout) |
1158 | { | 1161 | { |
1159 | set_current_state(TASK_INTERRUPTIBLE); | 1162 | __set_current_state(TASK_INTERRUPTIBLE); |
1160 | return schedule_timeout(timeout); | 1163 | return schedule_timeout(timeout); |
1161 | } | 1164 | } |
1162 | EXPORT_SYMBOL(schedule_timeout_interruptible); | 1165 | EXPORT_SYMBOL(schedule_timeout_interruptible); |
1163 | 1166 | ||
1164 | signed long __sched schedule_timeout_uninterruptible(signed long timeout) | 1167 | signed long __sched schedule_timeout_uninterruptible(signed long timeout) |
1165 | { | 1168 | { |
1166 | set_current_state(TASK_UNINTERRUPTIBLE); | 1169 | __set_current_state(TASK_UNINTERRUPTIBLE); |
1167 | return schedule_timeout(timeout); | 1170 | return schedule_timeout(timeout); |
1168 | } | 1171 | } |
1169 | EXPORT_SYMBOL(schedule_timeout_uninterruptible); | 1172 | EXPORT_SYMBOL(schedule_timeout_uninterruptible); |