summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-04-25 18:05:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-04-25 19:54:07 +0200
commit70c9f590ffc3f959cc81c1a3cecb6b8133caf35d (patch)
tree4dfb6a09876a1cf31d9e90415c6b1b5795798e6a /arch
parent82a355f5a2fdc203e5a32626d667ec43fc76b8b1 (diff)
downloadlinux-3.10-70c9f590ffc3f959cc81c1a3cecb6b8133caf35d.tar.gz
linux-3.10-70c9f590ffc3f959cc81c1a3cecb6b8133caf35d.tar.bz2
linux-3.10-70c9f590ffc3f959cc81c1a3cecb6b8133caf35d.zip
x86: remove set_fixmap() warning
set_fixmap()+clear_fixmap() is safe. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init_64.c2
1 files changed, 1 insertions, 1 deletions
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);