diff --git a/[refs] b/[refs] index 63de2feed25d..7983d5f779d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 228ebcbe634a30aec35132ea4375721bcc41bec0 +refs/heads/master: 19b9b9b54e5f115907efd56be2c3799775a46561 diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h index 243e287304d0..5ac5945696a0 100644 --- a/trunk/include/linux/init_task.h +++ b/trunk/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/trunk/include/linux/pid.h b/trunk/include/linux/pid.h index 16644cceb946..4817c6671e77 100644 --- a/trunk/include/linux/pid.h +++ b/trunk/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/trunk/kernel/pid.c b/trunk/kernel/pid.c index 73a60e265f52..bed9e7f80a50 100644 --- a/trunk/kernel/pid.c +++ b/trunk/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]);