summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/tlb.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:20:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:20:26 -0700
commitf797d37ead9afc9b5586f02789819a8fb72a55fc (patch)
tree8278cc2cdb32d5aabfab919e79afe56774618b8d /arch/sparc/mm/tlb.c
parent41341261aa1707b49f937ba2c20d1a0daa5afac3 (diff)
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff)
downloadlinux-f797d37ead9afc9b5586f02789819a8fb72a55fc.tar.bz2
Merge 3.10-rc7 into usb-next
We want the USB fixes and other good stuff in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/mm/tlb.c')
-rw-r--r--arch/sparc/mm/tlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index 83d89bcb44af..37e7bc4c95b3 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -85,8 +85,8 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
}
if (!tb->active) {
- global_flush_tlb_page(mm, vaddr);
flush_tsb_user_page(mm, vaddr);
+ global_flush_tlb_page(mm, vaddr);
goto out;
}