summaryrefslogtreecommitdiff
path: root/arch/s390/mm
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2012-05-09 16:27:38 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-05-16 14:42:41 +0200
commit2739b6d12407792f253b7a15233930338e6831c9 (patch)
tree312fe315052d2e7476413bb4ee2f23f641773f7d /arch/s390/mm
parentae73c76ab706a4f8d7e0bf92273242e7e1b43772 (diff)
downloadlinux-3.10-2739b6d12407792f253b7a15233930338e6831c9.tar.gz
linux-3.10-2739b6d12407792f253b7a15233930338e6831c9.tar.bz2
linux-3.10-2739b6d12407792f253b7a15233930338e6831c9.zip
s390/kvm: bad rss-counter state
commit c3f0327f8e9d7a503f0d64573c311eddd61f197d mm: add rss counters consistency check detected the following problem with kvm on s390: BUG: Bad rss-counter state mm:00000004f73ef000 idx:0 val:-10 BUG: Bad rss-counter state mm:00000004f73ef000 idx:1 val:-5 We have to make sure that we accumulate all rss values into the mm before we replace the mm to avoid triggering this (harmless) bug message. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r--arch/s390/mm/pgtable.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 6e765bf0067..a3db5a3ea08 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -822,6 +822,8 @@ int s390_enable_sie(void)
/* we copy the mm and let dup_mm create the page tables with_pgstes */
tsk->mm->context.alloc_pgste = 1;
+ /* make sure that both mms have a correct rss state */
+ sync_mm_rss(tsk->mm);
mm = dup_mm(tsk);
tsk->mm->context.alloc_pgste = 0;
if (!mm)