Commit c930b2c0 authored by Ingo Molnar's avatar Ingo Molnar

sched/core: Convert ___assert_task_state() link time assert to BUILD_BUG_ON()

The length of TASK_STATE_TO_CHAR_STR was still checked using the old
link-time manual error method - convert it to BUILD_BUG_ON(). This
has a couple of advantages:

 - it's more obvious what's going on

 - it reduces the size and complexity of <linux/sched.h>

 - BUILD_BUG_ON() will fail during compilation, with a clearer
   error message than the link time assert.
Acked-by: default avatarLinus Torvalds <>
Cc: Mike Galbraith <>
Cc: Peter Zijlstra <>
Cc: Thomas Gleixner <>
Signed-off-by: default avatarIngo Molnar <>
parent 9ccd27cc
......@@ -223,9 +223,6 @@ extern void proc_sched_set_task(struct task_struct *p);
extern char ___assert_task_state[1 - 2*!!(
sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
/* Convenience macros for the sake of set_current_state */
......@@ -5233,6 +5233,9 @@ void sched_show_task(struct task_struct *p)
int ppid;
unsigned long state = p->state;
/* Make sure the string lines up properly with the number of task states: */
if (!try_get_task_stack(p))
if (state)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment