projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
529b73f
)
procfs: fix /proc/statm
author
KAMEZAWA Hiroyuki
<
[email protected]
>
Wed, 28 Mar 2012 21:42:39 +0000
(14:42 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 29 Mar 2012 00:14:35 +0000
(17:14 -0700)
bda7bad62bc4
("procfs: speed up /proc/pid/stat, statm") broke /proc/statm
- 'text' is printed twice by mistake.
Signed-off-by: KAMEZAWA Hiroyuki <
[email protected]
>
Reported-by: Ulrich Drepper <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
fs/proc/array.c
patch
|
blob
|
history
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index fbb53c249086bf074ef273b3c69378e5f1746157..f9bd395b3473f6f1ca5f0697679d7d469e9fdb7c 100644
(file)
--- a/
fs/proc/array.c
+++ b/
fs/proc/array.c
@@
-550,7
+550,7
@@
int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
seq_put_decimal_ull(m, ' ', shared);
seq_put_decimal_ull(m, ' ', text);
seq_put_decimal_ull(m, ' ', 0);
- seq_put_decimal_ull(m, ' ',
text
);
+ seq_put_decimal_ull(m, ' ',
data
);
seq_put_decimal_ull(m, ' ', 0);
seq_putc(m, '\n');