diff options
| author |   Cedric Le Goater <clg@fr.ibm.com> | 2006-12-08 02:38:00 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:28:52 -0800 |
| commit | 6cc1b22a4acef3816eaa5f8c227d93d749b23195 (patch) | |
| tree | e21640221ca75fba9297f90946341e54356bf04e /fs/proc | |
| parent | [PATCH] to nsproxy (diff) | |
| download | linux-dev-6cc1b22a4acef3816eaa5f8c227d93d749b23195.tar.xz linux-dev-6cc1b22a4acef3816eaa5f8c227d93d749b23195.zip | |
[PATCH] use current->nsproxy->pid_ns
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>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 89ccfa16b000..f6d6f81dd446 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -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_pid_ns.last_pid); + nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid); return proc_calc_metrics(page, start, off, count, eof, len); } |