summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-02-04 07:58:29 +0100
committerIngo Molnar <mingo@kernel.org>2015-02-04 07:58:29 +0100
commit8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch)
tree8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /kernel/sched
parent1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff)
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
downloadlinux-8f4bf4bcc4d6f70a47baec5d73bd411e572842e0.tar.bz2
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d22fb16a7153..ae1188f62693 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7292,13 +7292,12 @@ void __might_sleep(const char *file, int line, int preempt_offset)
* since we will exit with TASK_RUNNING make sure we enter with it,
* otherwise we will destroy state.
*/
- if (WARN_ONCE(current->state != TASK_RUNNING,
+ WARN_ONCE(current->state != TASK_RUNNING && current->task_state_change,
"do not call blocking ops when !TASK_RUNNING; "
"state=%lx set at [<%p>] %pS\n",
current->state,
(void *)current->task_state_change,
- (void *)current->task_state_change))
- __set_current_state(TASK_RUNNING);
+ (void *)current->task_state_change);
___might_sleep(file, line, preempt_offset);
}