diff options
| author | Sukadev Bhattiprolu | 2006-12-08 11:37:58 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-12-08 17:28:52 +0100 |
| commit | 61a58c6c238cc81f7742b8cc84212cc55fb57747 (patch) | |
| tree | de0a4338b9c9c42aa5a47293e129282172a6053f /fs/proc | |
| parent | [PATCH] identifier to nsproxy (diff) | |
| download | kernel-qcow2-linux-61a58c6c238cc81f7742b8cc84212cc55fb57747.tar.gz kernel-qcow2-linux-61a58c6c238cc81f7742b8cc84212cc55fb57747.tar.xz kernel-qcow2-linux-61a58c6c238cc81f7742b8cc84212cc55fb57747.zip | |
[PATCH] rename struct pspace to struct pid_namespace
Rename struct pspace to struct pid_namespace for consistency with other
namespaces (uts_namespace and ipc_namespace). Also rename
include/linux/pspace.h to include/linux/pid_namespace.h and variables from
pspace to pid_ns.
Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/proc_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 9397ff62553e..89ccfa16b000 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -45,7 +45,7 @@ #include <linux/sysrq.h> #include <linux/vmalloc.h> #include <linux/crash_dump.h> -#include <linux/pspace.h> +#include <linux/pid_namespace.h> #include <asm/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> @@ -92,7 +92,7 @@ static int loadavg_read_proc(char *page, char **start, off_t off, LOAD_INT(a), LOAD_FRAC(a), LOAD_INT(b), LOAD_FRAC(b), LOAD_INT(c), LOAD_FRAC(c), - nr_running(), nr_threads, init_pspace.last_pid); + nr_running(), nr_threads, init_pid_ns.last_pid); return proc_calc_metrics(page, start, off, count, eof, len); } |