diff --git a/[refs] b/[refs]
index 77d01868d83a..9b2f838c189a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f249a6425a977314e4c2e35cab350fd600780386
+refs/heads/master: 2284ece2d6c1958dc0166aa3e9db0d0ee923ccb7
diff --git a/trunk/arch/arm/mm/tlb-v4wb.S b/trunk/arch/arm/mm/tlb-v4wb.S
index cb829ca7845d..c04598fa4d4a 100644
--- a/trunk/arch/arm/mm/tlb-v4wb.S
+++ b/trunk/arch/arm/mm/tlb-v4wb.S
@@ -69,9 +69,5 @@ ENTRY(v4wb_flush_kern_tlb_range)
 
 	__INITDATA
 
-	.type	v4wb_tlb_fns, #object
-ENTRY(v4wb_tlb_fns)
-	.long	v4wb_flush_user_tlb_range
-	.long	v4wb_flush_kern_tlb_range
-	.long	v4wb_tlb_flags
-	.size	v4wb_tlb_fns, . - v4wb_tlb_fns
+	/* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+	define_tlb_functions v4wb, v4wb_tlb_flags