A mismerge caused rss acounting to go wild as the rss vector was no
longer properly initialized.

Signed-off-by: Jan Kiszka <[email protected]>
---
 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

_______________________________________________
Adeos-main mailing list
[email protected]
https://mail.gna.org/listinfo/adeos-main

Reply via email to