From ba56fdeeb822d210bfb1d1f88bf25da17116721e Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Mon, 18 Dec 2006 00:38:21 +0900 Subject: [PATCH] --- yaml --- r: 45345 b: refs/heads/master c: 33b06b513e804ae64ebd5105fb703ec90bd7e173 h: refs/heads/master i: 45343: 5de68c037be9bf3551f91db54d47f1f552956c50 v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/pg-r4k.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f934cf8f8da1..f955068d02ae 100644 --- 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 index d41fc5885e87..dc795be62807 100644 --- 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)