diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-07 18:02:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-07 18:02:16 -0800 |
commit | d423421cb3e924cf68da231a732c3250c80afa4e (patch) | |
tree | 5b4cd07bd86bb3b2a4e249658a50146c867327f8 /arch/arm/mm/tlb-v6.S | |
parent | 850a9a4e3c019ce67e3bc29c810ac213ec4c169e (diff) | |
parent | 744bfe4c25716a7cfc5690aeab8d572b43d7c916 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3353/1: NAS100d: protect nas100d_power_exit() with machine_is_nas100d()
[ARM] 3352/1: DSB required for the completion of a TLB maintenance operation
Diffstat (limited to 'arch/arm/mm/tlb-v6.S')
-rw-r--r-- | arch/arm/mm/tlb-v6.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S index 6f76b89ef46..fd6adde3909 100644 --- a/arch/arm/mm/tlb-v6.S +++ b/arch/arm/mm/tlb-v6.S @@ -80,6 +80,7 @@ ENTRY(v6wbi_flush_kern_tlb_range) add r0, r0, #PAGE_SZ cmp r0, r1 blo 1b + mcr p15, 0, r2, c7, c10, 4 @ data synchronization barrier mov pc, lr .section ".text.init", #alloc, #execinstr |