diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2006-12-08 05:38:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:52 -0500 |
commit | 6cc1b22a4acef3816eaa5f8c227d93d749b23195 (patch) | |
tree | e21640221ca75fba9297f90946341e54356bf04e /fs | |
parent | 9a575a92db3312a40cdf0b0406d88de88ad9741e (diff) |
[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')
-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, | |||
92 | LOAD_INT(a), LOAD_FRAC(a), | 92 | LOAD_INT(a), LOAD_FRAC(a), |
93 | LOAD_INT(b), LOAD_FRAC(b), | 93 | LOAD_INT(b), LOAD_FRAC(b), |
94 | LOAD_INT(c), LOAD_FRAC(c), | 94 | LOAD_INT(c), LOAD_FRAC(c), |
95 | nr_running(), nr_threads, init_pid_ns.last_pid); | 95 | nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid); |
96 | return proc_calc_metrics(page, start, off, count, eof, len); | 96 | return proc_calc_metrics(page, start, off, count, eof, len); |
97 | } | 97 | } |
98 | 98 | ||