From 36e7559054421e7b1514d21303f80ef8e0827e66 Mon Sep 17 00:00:00 2001
From: Maksim Rayskiy <maksim.rayskiy@gmail.com>
Date: Thu, 10 Nov 2011 17:59:45 +0000
Subject: [PATCH] --- yaml --- r: 275496 b: refs/heads/master c:
 5c200197130e307de6eba72fc335c83c9dd6a5bc h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/kernel/traps.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bfe158716e5a..7888defd8f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2f909419b72cf043814bf17b96c93d4695378a1
+refs/heads/master: 5c200197130e307de6eba72fc335c83c9dd6a5bc
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 261ccbc07740..5c8a49d55054 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1596,7 +1596,8 @@ void __cpuinit per_cpu_trap_init(void)
 	}
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-	cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
+	if (!cpu_data[cpu].asid_cache)
+		cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
 
 	atomic_inc(&init_mm.mm_count);
 	current->active_mm = &init_mm;