3.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cyrill Gorcunov <gorcu...@gmail.com>
commit e9cdd6e771580e6ff872e5c64e8b766972c7d1bc upstream.
If a page we are inspecting is in swap we may occasionally report it as
having soft dirty bit (even if it is clean). The pte_soft_dirty helper
should be called on present pte only.
Signed-off-by: Cyrill Gorcunov <gorcu...@openvz.org>
Cc: Pavel Emelyanov <xe...@parallels.com>
Cc: Andy Lutomirski <l...@amacapital.net>
Cc: Matt Mackall <m...@selenic.com>
Cc: Xiao Guangrong <xiaoguangr...@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosa...@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motoh...@gmail.com>
Cc: Stephen Rothwell <s...@canb.auug.org.au>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
Reviewed-by: Naoya Horiguchi <n-horigu...@ah.jp.nec.com>
Cc: Mel Gorman <m...@csn.ul.ie>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
fs/proc/task_mmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -938,6 +938,8 @@ static void pte_to_pagemap_entry(pagemap
frame = pte_pfn(pte);
flags = PM_PRESENT;
page = vm_normal_page(vma, addr, pte);
+ if (pte_soft_dirty(pte))
+ flags2 |= __PM_SOFT_DIRTY;
} else if (is_swap_pte(pte)) {
swp_entry_t entry;
if (pte_swp_soft_dirty(pte))
@@ -955,8 +957,6 @@ static void pte_to_pagemap_entry(pagemap
if (page && !PageAnon(page))
flags |= PM_FILE;
- if (pte_soft_dirty(pte))
- flags2 |= __PM_SOFT_DIRTY;
*pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
