From: Jan Kiszka <jan.kiszka@domain.hid>
To: Philippe Gerum <rpm@xenomai.org>
Cc: adeos-main <adeos-main@gna.org>
Subject: [Adeos-main] [PATCH] Fix rss acounting
Date: Thu, 03 Jun 2010 16:40:44 +0200 [thread overview]
Message-ID: <4C07BEEC.6080100@domain.hid> (raw)
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
reply other threads:[~2010-06-03 14:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C07BEEC.6080100@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=adeos-main@gna.org \
--cc=rpm@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.