From 266735b658cd4883bb25ab04870db9706764149f Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 10 Feb 2005 13:54:37 +0000
Subject: [PATCH] --- yaml --- r: 10991 b: refs/heads/master c:
 79acf83e509dd0ca3db6c747bf58931984abc6e3 h: refs/heads/master i:   10989:
 d920d8c8a6b88a3628ed4374e8aaeb3897058f42   10987:
 deec58989903ed8c3ecdd9e39cd84d9921ce6ccd   10983:
 696bfc9d68f10b530ec2534846a02764e8be4d92   10975:
 a3a4aad514c2ce36b52a43a3ed7332cf4acc454f v: v3

---
 [refs]                     |  2 +-
 trunk/arch/mips/mm/c-r4k.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c5e7edde082a..54d24fe088be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6e8b587718c486b55c2ebecc6de231a30beba35
+refs/heads/master: 79acf83e509dd0ca3db6c747bf58931984abc6e3
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index b165b73e2583..429167321cfb 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -376,6 +376,13 @@ static inline void local_r4k_flush_cache_page(void *args)
 	pmd_t *pmdp;
 	pte_t *ptep;
 
+	/*
+	 * If ownes no valid ASID yet, cannot possibly have gotten
+	 * this page into the cache.
+	 */
+	if (cpu_context(smp_processor_id(), vma->vm_mm) == 0)
+		return;
+
 	page &= PAGE_MASK;
 	pgdp = pgd_offset(mm, page);
 	pudp = pud_offset(pgdp, page);
@@ -432,13 +439,6 @@ static void r4k_flush_cache_page(struct vm_area_struct *vma, unsigned long page,
 {
 	struct flush_cache_page_args args;
 
-	/*
-	 * If ownes no valid ASID yet, cannot possibly have gotten
-	 * this page into the cache.
-	 */
-	if (cpu_context(smp_processor_id(), vma->vm_mm) == 0)
-		return;
-
 	args.vma = vma;
 	args.page = page;