Commit 48b55837 authored by Chin Yik Ming's avatar Chin Yik Ming Committed by Ingo Molnar
Browse files

sched/headers: Rename task_struct::state to task_struct::__state in the comments too 



The rename in 2f064a59 ("sched: Change task_struct::state") missed the
comments.

[ mingo: Improved the changelog. ]

Signed-off-by: default avatarChin Yik Ming <yikming2222@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarDaniel Bristot de Oliveira <bristot@kernel.org>
Link: https://lore.kernel.org/r/20230717064952.2804-1-yikming2222@gmail.com
parent 7ee7642c

include/linux/sched.h

+6 −6
Original line number Diff line number Diff line
@@ -75,14 +75,14 @@ struct user_event_mm; 
 * Task state bitmask. NOTE! These bits are also

 * encoded in fs/proc/array.c: get_task_state().

 *

 * We have two separate sets of flags: task->state

 * We have two separate sets of flags: task->__state

 * is about runnability, while task->exit_state are

 * about the task exiting. Confusing, but this way

 * modifying one set can't modify the other one by

 * mistake.

 */



/* Used in tsk->state: */

/* Used in tsk->__state: */

#define TASK_RUNNING			0x00000000

#define TASK_INTERRUPTIBLE		0x00000001

#define TASK_UNINTERRUPTIBLE		0x00000002
@@ -92,7 +92,7 @@ struct user_event_mm; 
#define EXIT_DEAD			0x00000010

#define EXIT_ZOMBIE			0x00000020

#define EXIT_TRACE			(EXIT_ZOMBIE | EXIT_DEAD)

/* Used in tsk->state again: */

/* Used in tsk->__state again: */

#define TASK_PARKED			0x00000040

#define TASK_DEAD			0x00000080

#define TASK_WAKEKILL			0x00000100
@@ -173,7 +173,7 @@ struct user_event_mm; 
#endif



/*

 * set_current_state() includes a barrier so that the write of current->state

 * set_current_state() includes a barrier so that the write of current->__state

 * is correctly serialised wrt the caller's subsequent test of whether to

 * actually sleep:

 *
@@ -196,9 +196,9 @@ struct user_event_mm; 
 *   wake_up_state(p, TASK_UNINTERRUPTIBLE);

 *

 * where wake_up_state()/try_to_wake_up() executes a full memory barrier before

 * accessing p->state.

 * accessing p->__state.

 *

 * Wakeup will do: if (@state & p->state) p->state = TASK_RUNNING, that is,

 * Wakeup will do: if (@state & p->__state) p->__state = TASK_RUNNING, that is,

 * once it observes the TASK_UNINTERRUPTIBLE store the waking CPU can issue a

 * TASK_RUNNING store which can collide with __set_current_state(TASK_RUNNING).

 *