patch-2.4.22 linux-2.4.22/include/asm-mips/highmem.h

• Lines: 25
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips/highmem.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.21/include/asm-mips/highmem.h linux-2.4.22/include/asm-mips/highmem.h
@@ -46,18 +46,21 @@
 #define PKMAP_NR(virt)  ((virt-PKMAP_BASE) >> PAGE_SHIFT)
 #define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
 
-extern void * kmap_high(struct page *page);
+extern void * kmap_high(struct page *page, int nonblocking);
 extern void kunmap_high(struct page *page);
 
-static inline void *kmap(struct page *page)
+static inline void *__kmap(struct page *page, int nonblocking)
 {
 	if (in_interrupt())
 		out_of_line_bug();
 	if (page < highmem_start_page)
 		return page_address(page);
-	return kmap_high(page);
+	return kmap_high(page, nonblocking);
 }
 
+#define kmap(page)		__kmap(page, 0)
+#define kmap_nonblock(page)	__kmap(page, 1)
+
 static inline void kunmap(struct page *page)
 {
 	if (in_interrupt())