* [Adeos-main] [PATCH] Fix rss acounting
@ 2010-06-03 14:40 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2010-06-03 14:40 UTC (permalink / raw)
To: Philippe Gerum; +Cc: adeos-main
A mismerge caused rss acounting to go wild as the rss vector was no
longer properly initialized.
Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
---
mm/memory.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index b91ded4..0f6be32 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -784,8 +784,9 @@ again:
}
#else
again:
- init_rss_vec(rss);
#endif
+ init_rss_vec(rss);
+
dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
if (!dst_pte) {
if (uncow_page)
--
1.6.0.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-06-03 14:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-03 14:40 [Adeos-main] [PATCH] Fix rss acounting Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.