Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

[pandora-kernel.git] / arch / mn10300 / include / asm / highmem.h

diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h
index e2155e6..bfe2d88 100644 (file)
--- a/arch/mn10300/include/asm/highmem.h
+++ b/arch/mn10300/include/asm/highmem.h
@@ -87,7 +87,7 @@ static inline unsigned long __kmap_atomic(struct page *page)
                BUG();
 #endif
        set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));
                BUG();
 #endif
        set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));

-       __flush_tlb_one(vaddr);
+       local_flush_tlb_one(vaddr);

 
        return vaddr;
 }
 
        return vaddr;
 }


@@ -116,7 +116,7 @@ static inline void __kunmap_atomic(unsigned long vaddr)
                 * this pte without first remap it
                 */
                pte_clear(kmap_pte - idx);
                 * this pte without first remap it
                 */
                pte_clear(kmap_pte - idx);

-               __flush_tlb_one(vaddr);
+               local_flush_tlb_one(vaddr);

        }
 #endif
 
        }
 #endif