diff --git a/[refs] b/[refs]
index d87f445027a7..9781a95ec3d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f1296a5169c13b2c1f76c1446aaf361e8519050
+refs/heads/master: 17a82e932d67e2885d9fa18d4656ff53337b1130
diff --git a/trunk/include/asm-sparc/tlbflush.h b/trunk/include/asm-sparc/tlbflush.h
index 4a3b66618e75..a619da5cfaa9 100644
--- a/trunk/include/asm-sparc/tlbflush.h
+++ b/trunk/include/asm-sparc/tlbflush.h
@@ -57,6 +57,10 @@ BTFIXUPDEF_CALL(void, flush_tlb_page, struct vm_area_struct *, unsigned long)
 /*
  * This is a kludge, until I know better. --zaitcev XXX
  */
-#define flush_tlb_kernel_range(start, end) flush_tlb_all()
+static inline void flush_tlb_kernel_range(unsigned long start,
+					  unsigned long end)
+{
+	flush_tlb_all();
+}
 
 #endif /* _SPARC_TLBFLUSH_H */