- update to 2.6.1-rc2 -- first cut.

[linux-flexiantxendom0-3.2.10.git] / arch / mips / mm / highmem.c

diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index 0ae1245..2602af4 100644 (file)
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -40,6 +40,7 @@ void *kmap_atomic(struct page *page, enum km_type type)
        enum fixed_addresses idx;
        unsigned long vaddr;
 
+       /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
        inc_preempt_count();
        if (page < highmem_start_page)
                return page_address(page);
@@ -64,6 +65,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 
        if (vaddr < FIXADDR_START) { // FIXME
                dec_preempt_count();
+               preempt_check_resched();
                return;
        }
 
@@ -79,6 +81,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 #endif
 
        dec_preempt_count();
+       preempt_check_resched();
 }
 
 struct page *kmap_atomic_to_page(void *ptr)