Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio

[~andy/linux] / arch / arm / mm / tlb-fa.S

diff --git a/arch/arm/mm/tlb-fa.S b/arch/arm/mm/tlb-fa.S
index d887a31faaae7d1d93fa6265add0b84c7184e2f3..d3ddcf9a76ca449c0a81d71639879cce6bd10689 100644 (file)
--- a/arch/arm/mm/tlb-fa.S
+++ b/arch/arm/mm/tlb-fa.S
@@ -65,9 +65,5 @@ ENTRY(fa_flush_kern_tlb_range)
 
        __INITDATA
 
-       .type   fa_tlb_fns, #object
-ENTRY(fa_tlb_fns)
-       .long   fa_flush_user_tlb_range
-       .long   fa_flush_kern_tlb_range
-       .long   fa_tlb_flags
-       .size   fa_tlb_fns, . - fa_tlb_fns
+       /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+       define_tlb_functions fa, fa_tlb_flags