X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-frv%2Fhighmem.h;h=ff4d6cdeb1522811bd4131da61d68575ff55502b;hb=0e4bd10c9b7e9ed65132f5935328275deb760384;hp=0f390f41f81680a70c12fe26cdae314644466344;hpb=5206a79d7b217c139116fc6faef55d1c0e65c800;p=linux-2.6

diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index 0f390f41f8..ff4d6cdeb1 100644
--- a/include/asm-frv/highmem.h
+++ b/include/asm-frv/highmem.h
@@ -115,7 +115,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 {
 	unsigned long paddr;
 
-	inc_preempt_count();
+	pagefault_disable();
 	paddr = page_to_phys(page);
 
 	switch (type) {
@@ -170,8 +170,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
 	default:
 		BUG();
 	}
-	dec_preempt_count();
-	preempt_check_resched();
+	pagefault_enable();
 }
 
 #endif /* !__ASSEMBLY__ */