diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mm/tlb-v7.S | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 (diff) | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mm/tlb-v7.S')
| -rw-r--r-- | arch/arm/mm/tlb-v7.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S index 86bb71664508..845f461f8ec1 100644 --- a/arch/arm/mm/tlb-v7.S +++ b/arch/arm/mm/tlb-v7.S | |||
| @@ -79,10 +79,5 @@ ENDPROC(v7wbi_flush_kern_tlb_range) | |||
| 79 | 79 | ||
| 80 | __INIT | 80 | __INIT |
| 81 | 81 | ||
| 82 | .type v7wbi_tlb_fns, #object | 82 | /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */ |
| 83 | ENTRY(v7wbi_tlb_fns) | 83 | define_tlb_functions v7wbi, v7wbi_tlb_flags_up, flags_smp=v7wbi_tlb_flags_smp |
| 84 | .long v7wbi_flush_user_tlb_range | ||
| 85 | .long v7wbi_flush_kern_tlb_range | ||
| 86 | ALT_SMP(.long v7wbi_tlb_flags_smp) | ||
| 87 | ALT_UP(.long v7wbi_tlb_flags_up) | ||
| 88 | .size v7wbi_tlb_fns, . - v7wbi_tlb_fns | ||