aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/mm/init.c')
-rw-r--r--arch/mips/mm/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index faa5c9822ecc..198a3147dd7d 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -90,6 +90,7 @@ static void *__kmap_pgprot(struct page *page, unsigned long addr, pgprot_t prot)
90 90
91 BUG_ON(Page_dcache_dirty(page)); 91 BUG_ON(Page_dcache_dirty(page));
92 92
93 preempt_disable();
93 pagefault_disable(); 94 pagefault_disable();
94 idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); 95 idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1);
95 idx += in_interrupt() ? FIX_N_COLOURS : 0; 96 idx += in_interrupt() ? FIX_N_COLOURS : 0;
@@ -152,6 +153,7 @@ void kunmap_coherent(void)
152 write_c0_entryhi(old_ctx); 153 write_c0_entryhi(old_ctx);
153 local_irq_restore(flags); 154 local_irq_restore(flags);
154 pagefault_enable(); 155 pagefault_enable();
156 preempt_enable();
155} 157}
156 158
157void copy_user_highpage(struct page *to, struct page *from, 159void copy_user_highpage(struct page *to, struct page *from,