diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 243e287304d089fff691167a35fb88e71d99a832..5ac5945696a03742f0a526530334107f96452796 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -94,9 +94,6 @@ extern struct group_info init_groups; #define INIT_STRUCT_PID { \ .count = ATOMIC_INIT(1), \ - .nr = 0, \ - /* Don't put this struct pid in pid_hash */ \ - .pid_chain = { .next = NULL, .pprev = NULL }, \ .tasks = { \ { .first = &init_task.pids[PIDTYPE_PID].node }, \ { .first = &init_task.pids[PIDTYPE_PGID].node }, \ diff --git a/include/linux/pid.h b/include/linux/pid.h index 16644cceb94662bb7d006f45780c0e7560b5cdd8..4817c6671e772560b4f715cdb695de24c68ad937 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -57,9 +57,6 @@ struct upid { struct pid { atomic_t count; - /* Try to keep pid_chain in the same cacheline as nr for find_pid */ - int nr; - struct hlist_node pid_chain; /* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX]; struct rcu_head rcu; diff --git a/kernel/pid.c b/kernel/pid.c index 73a60e265f524772c49614b58dc58b09f68eccb2..bed9e7f80a50cee36e09c630c02688edd6b97624 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -263,7 +263,6 @@ struct pid *alloc_pid(struct pid_namespace *ns) get_pid_ns(ns); pid->level = ns->level; - pid->nr = pid->numbers[0].nr; atomic_set(&pid->count, 1); for (type = 0; type < PIDTYPE_MAX; ++type) INIT_HLIST_HEAD(&pid->tasks[type]);