summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/tlb-fa.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-22 23:09:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-22 23:09:07 +0100
commit3ad55155b222f2a901405dea20ff7c68828ecd92 (patch)
tree53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mm/tlb-fa.S
parent06f365acef5ca54fd5708a0d853c4a89609536f1 (diff)
parent6645cb61f3a1186a71475385d33f875dd8fb38bf (diff)
downloadop-kernel-dev-3ad55155b222f2a901405dea20ff7c68828ecd92.zip
op-kernel-dev-3ad55155b222f2a901405dea20ff7c68828ecd92.tar.gz
Merge branch 'devel-stable' into for-next
Conflicts: arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mm/tlb-fa.S')
-rw-r--r--arch/arm/mm/tlb-fa.S8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mm/tlb-fa.S b/arch/arm/mm/tlb-fa.S
index d887a31..d3ddcf9 100644
--- 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
OpenPOWER on IntegriCloud