Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / arm / mm / tlb-v3.S

diff --git a/arch/arm/mm/tlb-v3.S b/arch/arm/mm/tlb-v3.S
index c10786e..d253995 100644 (file)
--- a/arch/arm/mm/tlb-v3.S
+++ b/arch/arm/mm/tlb-v3.S
@@ -44,9 +44,5 @@ ENTRY(v3_flush_kern_tlb_range)
 
        __INITDATA
 
-       .type   v3_tlb_fns, #object
-ENTRY(v3_tlb_fns)
-       .long   v3_flush_user_tlb_range
-       .long   v3_flush_kern_tlb_range
-       .long   v3_tlb_flags
-       .size   v3_tlb_fns, . - v3_tlb_fns
+       /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+       define_tlb_functions v3, v3_tlb_flags