git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into for-linus/xen/master
[safe/jmp/linux-2.6]
/
arch
/
x86
/
mm
/
highmem_32.c
diff --git
a/arch/x86/mm/highmem_32.c
b/arch/x86/mm/highmem_32.c
index
8126e8d
..
58f621e
100644
(file)
--- a/
arch/x86/mm/highmem_32.c
+++ b/
arch/x86/mm/highmem_32.c
@@
-44,7
+44,6
@@
void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
set_pte(kmap_pte-idx, mk_pte(page, prot));
- arch_flush_lazy_mmu_mode();
return (void *)vaddr;
}
@@
-74,7
+73,6
@@
void kunmap_atomic(void *kvaddr, enum km_type type)
#endif
}
- arch_flush_lazy_mmu_mode();
pagefault_enable();
}