patch-2.4.21 linux-2.4.21/include/asm-sparc/highmem.h

• Lines: 28
• Date: 2003-06-13 07:51:38.000000000 -0700
• Orig file: linux-2.4.20/include/asm-sparc/highmem.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.20/include/asm-sparc/highmem.h linux-2.4.21/include/asm-sparc/highmem.h
@@ -27,7 +27,7 @@
 #define HIGHMEM_DEBUG 1
 
 /* in mm/highmem.c */
-extern void *kmap_high(struct page *page);
+extern void *kmap_high(struct page *page, int nonblocking);
 extern void kunmap_high(struct page *page);
 
 /* declarations for highmem.c */
@@ -60,13 +60,16 @@
 void *kmap_atomic(struct page *page, enum km_type type);
 void kunmap_atomic(void *kvaddr, enum km_type type);
 
-static inline void *kmap(struct page *page)
+#define kmap(page) __kmap(page, 0)
+#define kmap_nonblock(page) __kmap(page, 1)
+
+static inline void *__kmap(struct page *page, int nonblocking)
 {
 	if (in_interrupt())
 		BUG();
 	if (page < highmem_start_page)
 		return page_address(page);
-	return kmap_high(page);
+	return kmap_high(page, nonblocking);
 }
 
 static inline void kunmap(struct page *page)