commit 70c9f590ffc3f959cc81c1a3cecb6b8133caf35d
author Ingo Molnar <mingo@elte.hu> Fri Apr 25 18:05:57 2008 +0200
committer Ingo Molnar <mingo@elte.hu> Fri Apr 25 19:54:07 2008 +0200
tree 4dfb6a09876a1cf31d9e90415c6b1b5795798e6a
parent 82a355f5a2fdc203e5a32626d667ec43fc76b8b1

x86: remove set_fixmap() warning

set_fixmap()+clear_fixmap() is safe.

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

arch/x86/mm/init_64.c

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 7a81dd0..b798e7b 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -173,7 +173,7 @@
 	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);