From 1e1b3834b610cee7cfdbf35b6178a75a7ec462ed Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Wed, 22 Sep 2010 13:05:06 -0700
Subject: [PATCH] --- yaml --- r: 210917 b: refs/heads/master c:
 1c2499ae87f828eabddf6483b0dfc11da1100c07 h: refs/heads/master i:   210915:
 3d4b56170ba0ad20e4dee6579b3e988d121c00c0 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/proc/task_mmu.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 65aeb508643f..85b25746ac81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 142092e577255e33a4ab74c6baad04c9fb887927
+refs/heads/master: 1c2499ae87f828eabddf6483b0dfc11da1100c07
diff --git a/trunk/fs/proc/task_mmu.c b/trunk/fs/proc/task_mmu.c
index 271afc48b9a5..1dbca4e8cc16 100644
--- a/trunk/fs/proc/task_mmu.c
+++ b/trunk/fs/proc/task_mmu.c
@@ -363,13 +363,13 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
 			mss->referenced += PAGE_SIZE;
 		mapcount = page_mapcount(page);
 		if (mapcount >= 2) {
-			if (pte_dirty(ptent))
+			if (pte_dirty(ptent) || PageDirty(page))
 				mss->shared_dirty += PAGE_SIZE;
 			else
 				mss->shared_clean += PAGE_SIZE;
 			mss->pss += (PAGE_SIZE << PSS_SHIFT) / mapcount;
 		} else {
-			if (pte_dirty(ptent))
+			if (pte_dirty(ptent) || PageDirty(page))
 				mss->private_dirty += PAGE_SIZE;
 			else
 				mss->private_clean += PAGE_SIZE;