From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 12:34:08 +0000 (+0100)
Subject: x86: cpa: clean up change_page_attr_set/clear()
X-Git-Tag: v2.6.25-rc1~1143^2~41
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6eade8ff461fdf13ec6780602eb5618e0bdaa972;p=linux-2.6-omap-h63xx.git

x86: cpa: clean up change_page_attr_set/clear()

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 5cfc0d4ade5..145f5edf488 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -312,10 +312,10 @@ static int change_page_attr_set(unsigned long addr, int numpages,
 	for (i = 0; i < numpages ; i++) {
 
 		pte = lookup_address(addr, &level);
-		if (pte)
-			current_prot = pte_pgprot(*pte);
-		else
-			pgprot_val(current_prot) = 0;
+		if (!pte)
+			return -EINVAL;
+
+		current_prot = pte_pgprot(*pte);
 
 		pgprot_val(new_prot) =
 			pgprot_val(current_prot) | pgprot_val(prot);
@@ -356,11 +356,12 @@ static int change_page_attr_clear(unsigned long addr, int numpages,
 	int i, ret;
 
 	for (i = 0; i < numpages; i++) {
+
 		pte = lookup_address(addr, &level);
-		if (pte)
-			current_prot = pte_pgprot(*pte);
-		else
-			pgprot_val(current_prot) = 0;
+		if (!pte)
+			return -EINVAL;
+
+		current_prot = pte_pgprot(*pte);
 
 		pgprot_val(new_prot) =
 				pgprot_val(current_prot) & ~pgprot_val(prot);