Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / include / linux / pid.h

diff --git a/include/linux/pid.h b/include/linux/pid.h
index 16644cceb94662bb7d006f45780c0e7560b5cdd8..e29a900a84992f308ced20ed5ce4e9a4f2685f09 100644 (file)
--- 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;
@@ -113,9 +110,8 @@ extern struct pid_namespace init_pid_ns;
  * see also find_task_by_pid() set in include/linux/sched.h
  */
 extern struct pid *FASTCALL(find_pid_ns(int nr, struct pid_namespace *ns));
-
-#define find_vpid(pid) find_pid_ns(pid, current->nsproxy->pid_ns)
-#define find_pid(pid)  find_pid_ns(pid, &init_pid_ns)
+extern struct pid *find_vpid(int nr);
+extern struct pid *find_pid(int nr);
 
 /*
  * Lookup a PID in the hash table, and return with it's count elevated.