From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Apr 2008 16:05:57 +0000 (+0200)
Subject: x86: remove set_fixmap() warning
X-Git-Tag: v2.6.26-rc1~1073^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=70c9f590ffc3f959cc81c1a3cecb6b8133caf35d;p=linux-2.6-omap-h63xx.git

x86: remove set_fixmap() warning

set_fixmap()+clear_fixmap() is safe.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 7a81dd02069..b798e7b92b1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -173,7 +173,7 @@ set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
 	new_pte = pfn_pte(phys >> PAGE_SHIFT, prot);
 
 	pte = pte_offset_kernel(pmd, vaddr);
-	if (!pte_none(*pte) &&
+	if (!pte_none(*pte) && pte_val(new_pte) &&
 	    pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
 		pte_ERROR(*pte);
 	set_pte(pte, new_pte);