sched: Fixed typo in comment
PATCH 1/1 sched: Fixed typo in comment
task_struct's state member is prefixed by "__"
--- include/linux/sched.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/sched.h +6 -6
@@ -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). *
Signature · 1 line
2.34.1
Quoted 3 lines · Chin Yik Ming
task_struct's state member is prefixed by "__"
Signed-off-by Chin Yik Ming <[email protected]>
-- Daniel
Peter Zijlstra
maintainerQuoted 1 line · Chin Yik Ming
task_struct's state member is prefixed by "__"
This isn't a typo, the member got renamed long after these comments were written.
Also, nobody should be accessing task->__state, so it being spelled wrong in a comment doesn't seem like a problem to me.
[tip: sched/core] sched/headers: Rename task_struct::state to task_strate::__state in the comments too
In reply to Chin Yik MingThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 2ae2fb98b77339277a2c2f18dfec605dfd8dd321 Gitweb: https://git.kernel.org/tip/2ae2fb98b77339277a2c2f18dfec605dfd8dd321 Author: Chin Yik Ming <[email protected]> AuthorDate: Mon, 17 Jul 2023 14:49:52 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 17 Jul 2023 11:03:55 +02:00
sched/headers: Rename task_struct::state to task_strate::__state in the comments too
The rename in 2f064a59a11f ("sched: Change task_struct::state") missed the comments.
[ mingo: Improved the changelog. ]
--- include/linux/sched.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/sched.h +6 -6
@@ -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). *
[tip: sched/core] sched/headers: Rename task_struct::state to task_struct::__state in the comments too
In reply to Chin Yik MingThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 48b5583719cdfbdee238f9549a6a1a47af2b0469 Gitweb: https://git.kernel.org/tip/48b5583719cdfbdee238f9549a6a1a47af2b0469 Author: Chin Yik Ming <[email protected]> AuthorDate: Mon, 17 Jul 2023 14:49:52 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Jul 2023 09:42:58 +02:00
sched/headers: Rename task_struct::state to task_struct::__state in the comments too
The rename in 2f064a59a11f ("sched: Change task_struct::state") missed the comments.
[ mingo: Improved the changelog. ]
--- include/linux/sched.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/sched.h +6 -6
@@ -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). *