---

yaml --- r: 210917 b: refs/heads/master c: 1c2499a h: refs/heads/master i: 210915: 3d4b561 v: v3
git-mirror · Sep 23, 2010 · 1e1b383 · 1e1b383
1 parent 7e5c852
commit 1e1b383
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;