Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S
index efbe94b..1f6062b 100644 (file)
--- a/arch/arm/mm/tlb-v4wbi.S
+++ b/arch/arm/mm/tlb-v4wbi.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
 
@@ -60,9 +60,5 @@ ENTRY(v4wbi_flush_kern_tlb_range)
 
        __INITDATA
 
-       .type   v4wbi_tlb_fns, #object
-ENTRY(v4wbi_tlb_fns)
-       .long   v4wbi_flush_user_tlb_range
-       .long   v4wbi_flush_kern_tlb_range
-       .long   v4wbi_tlb_flags
-       .size   v4wbi_tlb_fns, . - v4wbi_tlb_fns
+       /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+       define_tlb_functions v4wbi, v4wbi_tlb_flags