diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-12-17 16:38:21 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-01-08 22:41:04 +0100 |
| commit | 33b06b513e804ae64ebd5105fb703ec90bd7e173 (patch) | |
| tree | 09666a89c0edc9fc62be62970bf09c24acc774c4 | |
| parent | [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor (diff) | |
| download | linux-33b06b513e804ae64ebd5105fb703ec90bd7e173.tar.xz linux-33b06b513e804ae64ebd5105fb703ec90bd7e173.zip | |
[MIPS] TX49: Fix use of CDEX build_store_reg()
The commit a923660d786a53e78834b19062f7af2535f7f8ad accidently
prevents TX49 from using CDEX. Use build_dst_pref() only if prefetch
for store was really available.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/mm/pg-r4k.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c index d41fc5885e87..dc795be62807 100644 --- a/arch/mips/mm/pg-r4k.c +++ b/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) |