From 1cd06c0eda9ddf00f4dd263debe5d06b5e163c0c Mon Sep 17 00:00:00 2001
From: Dave Martin <dave.martin@linaro.org>
Date: Thu, 23 Jun 2011 17:30:11 +0100
Subject: [PATCH] --- yaml --- r: 258303 b: refs/heads/master c:
 2284ece2d6c1958dc0166aa3e9db0d0ee923ccb7 h: refs/heads/master i:   258301:
 3854987f7e837afd3b5481ed4673f91a06f26a30   258299:
 c95461896fa53dcbf838440222e7a6794f62c3e3   258295:
 2b6791c100c84fc628961bffc6f4698de06b15c9   258287:
 202e2c80f9867c1a5596bcdb9366f749390f6ecc   258271:
 890c5cefb28ef0a0c1b6b083199b47ea6981ca92   258239:
 3a37963ce6f7fa197e23b52a3d2b3ce5a5849442   258175:
 b298378ed2d5757319b2bfa5815182376165b6a5   258047:
 cc12fc21ea0e9e4af159d57a9799e312f230a2ee v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/mm/tlb-v4wb.S | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

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