[folded-merged] x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch removed from -mm tree

[folded-merged] x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: x86-mm-ptdump-calculate-effective-permissions-correctly-fix
has been removed from the -mm tree.  Its filename was
     x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch

This patch was dropped because it was folded into x86-mm-ptdump-calculate-effective-permissions-correctly.patch

------------------------------------------------------
From: Steven Price <steven.price@arm.com>
Subject: x86-mm-ptdump-calculate-effective-permissions-correctly-fix

make the assignment conditional on val != 0.

Link: http://lkml.kernel.org/r/430c8ab4-e7cd-6933-dde6-087fac6db872@arm.com
Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/mm/dump_pagetables.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/mm/dump_pagetables.c~x86-mm-ptdump-calculate-effective-permissions-correctly-fix
+++ a/arch/x86/mm/dump_pagetables.c
@@ -282,10 +282,10 @@ static void note_page(struct ptdump_stat
 	struct seq_file *m = st->seq;
 
 	new_prot = val & PTE_FLAGS_MASK;
-	new_eff = st->prot_levels[level];