diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2021-06-11 10:28:14 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org>
| 2021-06-18 11:43:08 +0200 |
| commit | d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1 (patch) | |
| tree | d555f1e520de852c69089be5b1d5fe8245ec4244 /kernel | |
| parent | sched,perf,kvm: Fix preemption condition (diff) | |
| download | linux-d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1.tar.gz linux-d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1.tar.bz2 linux-d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1.zip | |
sched: Add get_current_state()
Remove yet another few p->state accesses.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210611082838.347475156@infradead.org
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/freezer.c | 2 | ||||
| -rw-r--r-- | kernel/sched/core.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/freezer.c b/kernel/freezer.c index dc520f01f99d..45ab36ffd0e7 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c @@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop) /* Hmm, should we be allowed to suspend when there are realtime processes around? */ bool was_frozen = false; - long save = current->state; + unsigned int save = get_current_state(); pr_debug("%s entered refrigerator\n", current->comm); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 618c2b5a5758..45ebb3cfe86c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9098,15 +9098,15 @@ static inline int preempt_count_equals(int preempt_offset) void __might_sleep(const char *file, int line, int preempt_offset) { + unsigned int state = get_current_state(); /* * Blocking primitives will set (and therefore destroy) current->state, * since we will exit with TASK_RUNNING make sure we enter with it, * otherwise we will destroy state. */ - WARN_ONCE(current->state != TASK_RUNNING && current->task_state_change, + WARN_ONCE(state != TASK_RUNNING && current->task_state_change, "do not call blocking ops when !TASK_RUNNING; " - "state=%lx set at [<%p>] %pS\n", - current->state, + "state=%x set at [<%p>] %pS\n", state, (void *)current->task_state_change, (void *)current->task_state_change); |