---

yaml --- r: 45345 b: refs/heads/master c: 33b06b5 h: refs/heads/master i: 45343: 5de68c0 v: v3
git-mirror · Jan 8, 2007 · ba56fde · ba56fde
1 parent a13cdb7
commit ba56fde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d98f92371461c5c8cc24e12a212c59b3f437b581
+refs/heads/master: 33b06b513e804ae64ebd5105fb703ec90bd7e173
diff --git a/trunk/arch/mips/mm/pg-r4k.c b/trunk/arch/mips/mm/pg-r4k.c
@@ -243,11 +243,10 @@ static void __init __build_store_reg(int reg)
 
 static inline void build_store_reg(int reg)
 {
-	if (cpu_has_prefetch)
-		if (reg)
-			build_dst_pref(pref_offset_copy);
-		else
-			build_dst_pref(pref_offset_clear);
+	int pref_off = cpu_has_prefetch ?
+		(reg ? pref_offset_copy : pref_offset_clear) : 0;
+	if (pref_off)
+		build_dst_pref(pref_off);
 	else if (cpu_has_cache_cdex_s)
 		build_cdex_s();
 	else if (cpu_has_cache_cdex_p)