Unroll INIT_STRUCT_PID in the single place that uses it. There doesn't seem any point in the macro.
Signed-off-by: David Howells <[email protected]> --- include/linux/init_task.h | 15 --------------- kernel/pid.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 10ab168b73b6..8af167b5abcb 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -45,21 +45,6 @@ extern struct cred init_cred; #endif -#define INIT_STRUCT_PID { \ - .count = ATOMIC_INIT(1), \ - .tasks = { \ - { .first = NULL }, \ - { .first = NULL }, \ - { .first = NULL }, \ - }, \ - .level = 0, \ - .numbers = { { \ - .nr = 0, \ - .ns = &init_pid_ns, \ - .pid_chain = { .next = NULL, .pprev = NULL }, \ - }, } \ -} - #define INIT_PID_LINK(type) \ { \ .node = { \ diff --git a/kernel/pid.c b/kernel/pid.c index 0143ac0ddceb..d12747d4f01e 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -44,7 +44,20 @@ hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) static struct hlist_head *pid_hash; static unsigned int pidhash_shift = 4; -struct pid init_struct_pid = INIT_STRUCT_PID; +struct pid init_struct_pid = { + .count = ATOMIC_INIT(1), + .tasks = { + { .first = NULL }, + { .first = NULL }, + { .first = NULL }, + }, + .level = 0, + .numbers = { { + .nr = 0, + .ns = &init_pid_ns, + .pid_chain = { .next = NULL, .pprev = NULL }, + }, } +}; int pid_max = PID_MAX_DEFAULT;
