sched: Add get_current_state()

Remove yet another few p->state accesses.

Peter Zijlstra committed 5 years ago

Commit d6c23bb1 parent 3ba9f934 files · +7 −5Browse files

Showing the changes to kernel (2 of 4 files). Show all

Unified · Split

2 files

@@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop) · 57 unmodified lines
58	/* Hmm, should we be allowed to suspend when there are realtime	58	/* Hmm, should we be allowed to suspend when there are realtime
59	processes around? */	59	processes around? */
60	bool was_frozen = false;	60	bool was_frozen = false;
61	long save = current->state;	61	unsigned int save = get_current_state();
62		62
63	pr_debug("%s entered refrigerator\n", current->comm);	63	pr_debug("%s entered refrigerator\n", current->comm);
64		64

 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",
+			"state=%x set at [<%p>] %pS\n", state,
-			current->state,
 			(void *)current->task_state_change,
 			(void *)current->task_state_change);

Keyboard shortcuts