diff --git a/[refs] b/[refs] index f44df40278c4..acfe9f481b4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ae4eed34be0177a8e003411a84e4ee212adbced +refs/heads/master: 33166b1ffca5e1945246bcaa77d72a22b0d3e531 diff --git a/trunk/include/linux/pid.h b/trunk/include/linux/pid.h index c21c7e8124a7..6f084b9e2c40 100644 --- a/trunk/include/linux/pid.h +++ b/trunk/include/linux/pid.h @@ -57,10 +57,10 @@ struct upid { struct pid { atomic_t count; + unsigned int level; /* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX]; struct rcu_head rcu; - unsigned int level; struct upid numbers[1]; };