Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[karo-tx-linux.git] / arch / arm / mm / tlb-v4.S

diff --git a/arch/arm/mm/tlb-v4.S b/arch/arm/mm/tlb-v4.S
index d6c94457c2b9d7b0949d97c02406e806038b5303..17a025ade5733c39d0be6c01f7e6db9cf2ad4445 100644 (file)
--- a/arch/arm/mm/tlb-v4.S
+++ b/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