diff --git a/[refs] b/[refs]
index 1bb485c77a19..77d01868d83a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7b84d2438ece9bcf680ea184c8d5cf34239699d
+refs/heads/master: f249a6425a977314e4c2e35cab350fd600780386
diff --git a/trunk/arch/arm/mm/tlb-v4.S b/trunk/arch/arm/mm/tlb-v4.S
index d6c94457c2b9..17a025ade573 100644
--- a/trunk/arch/arm/mm/tlb-v4.S
+++ b/trunk/arch/arm/mm/tlb-v4.S
@@ -57,9 +57,5 @@ ENTRY(v4_flush_user_tlb_range)
 
 	__INITDATA
 
-	.type	v4_tlb_fns, #object
-ENTRY(v4_tlb_fns)
-	.long	v4_flush_user_tlb_range
-	.long	v4_flush_kern_tlb_range
-	.long	v4_tlb_flags
-	.size	v4_tlb_fns, . - v4_tlb_fns
+	/* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+	define_tlb_functions v4, v4_tlb_flags