diff options
Diffstat (limited to 'arch/mips/mm/init.c')
-rw-r--r-- | arch/mips/mm/init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index e205ef598e97..12156176c7ca 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -124,7 +124,7 @@ void *kmap_coherent(struct page *page, unsigned long addr) | |||
124 | 124 | ||
125 | BUG_ON(Page_dcache_dirty(page)); | 125 | BUG_ON(Page_dcache_dirty(page)); |
126 | 126 | ||
127 | inc_preempt_count(); | 127 | pagefault_disable(); |
128 | idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); | 128 | idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); |
129 | #ifdef CONFIG_MIPS_MT_SMTC | 129 | #ifdef CONFIG_MIPS_MT_SMTC |
130 | idx += FIX_N_COLOURS * smp_processor_id() + | 130 | idx += FIX_N_COLOURS * smp_processor_id() + |
@@ -193,8 +193,7 @@ void kunmap_coherent(void) | |||
193 | write_c0_entryhi(old_ctx); | 193 | write_c0_entryhi(old_ctx); |
194 | EXIT_CRITICAL(flags); | 194 | EXIT_CRITICAL(flags); |
195 | #endif | 195 | #endif |
196 | dec_preempt_count(); | 196 | pagefault_enable(); |
197 | preempt_check_resched(); | ||
198 | } | 197 | } |
199 | 198 | ||
200 | void copy_user_highpage(struct page *to, struct page *from, | 199 | void copy_user_highpage(struct page *to, struct page *from, |