From 7d72a5c18fd1d8bc11fb7771789242d74155b73e Mon Sep 17 00:00:00 2001
From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Tue, 18 Jun 2013 09:05:36 -0500
Subject: [PATCH] --- yaml --- r: 377237 b: refs/heads/master c:
 23a01138efe216f8084cfaa74b0b90dd4b097441 h: refs/heads/master i:   377235:
 030dea6cab9c17d62861d1abdf00aa27672c035a v: v3

---
 [refs]                    | 2 +-
 trunk/arch/sparc/mm/tlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1447df6d34df..03c0c1025e6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f670758f5b829169562e1016a72af0c59360a541
+refs/heads/master: 23a01138efe216f8084cfaa74b0b90dd4b097441
diff --git a/trunk/arch/sparc/mm/tlb.c b/trunk/arch/sparc/mm/tlb.c
index 83d89bcb44af..37e7bc4c95b3 100644
--- a/trunk/arch/sparc/mm/tlb.c
+++ b/trunk/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;
 	}