diff --git a/[refs] b/[refs]
index 25f7d355c0ab..f3c05dab9140 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0ad83da17b6ba07f9eb5902e69daac90c4fa61
+refs/heads/master: 87be2f88b24ad1f206a5c87529ff406e96c95a12
diff --git a/trunk/arch/parisc/include/asm/cacheflush.h b/trunk/arch/parisc/include/asm/cacheflush.h
index 79f694f3ad9b..f0e2784e7cca 100644
--- a/trunk/arch/parisc/include/asm/cacheflush.h
+++ b/trunk/arch/parisc/include/asm/cacheflush.h
@@ -140,7 +140,10 @@ static inline void *kmap(struct page *page)
 	return page_address(page);
 }
 
-#define kunmap(page)			kunmap_parisc(page_address(page))
+static inline void kunmap(struct page *page)
+{
+	kunmap_parisc(page_address(page));
+}
 
 static inline void *kmap_atomic(struct page *page)
 {