diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-02 02:11:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-02 02:11:49 -0400 |
| commit | c9b59da130b4430910e02a80816f317534cd5e53 (patch) | |
| tree | 57746ca282cac8b398147807b7e107a5260015b1 /arch/powerpc/include/asm/highmem.h | |
| parent | 9f5494b797eb334f3aba5894a0b5b34d332a3149 (diff) | |
| parent | 4ee7084eb11e00eb02dc8435fd18273a61ffa9bf (diff) | |
Merge commit 'kumar/kumar-mmu'
Diffstat (limited to 'arch/powerpc/include/asm/highmem.h')
| -rw-r--r-- | arch/powerpc/include/asm/highmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h index 5d99b6489d56..91c589520c0a 100644 --- a/arch/powerpc/include/asm/highmem.h +++ b/arch/powerpc/include/asm/highmem.h | |||
| @@ -84,7 +84,7 @@ static inline void *kmap_atomic_prot(struct page *page, enum km_type type, pgpro | |||
| 84 | #ifdef CONFIG_DEBUG_HIGHMEM | 84 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 85 | BUG_ON(!pte_none(*(kmap_pte-idx))); | 85 | BUG_ON(!pte_none(*(kmap_pte-idx))); |
| 86 | #endif | 86 | #endif |
| 87 | set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot)); | 87 | __set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot)); |
| 88 | flush_tlb_page(NULL, vaddr); | 88 | flush_tlb_page(NULL, vaddr); |
| 89 | 89 | ||
| 90 | return (void*) vaddr; | 90 | return (void*) vaddr; |