diff options
author | Huacai Chen <chenhc@lemote.com> | 2014-01-14 20:56:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-15 02:19:42 -0500 |
commit | bad009fe354a00e6b2bf87328995ec76e59ab970 (patch) | |
tree | 842f0a9b39820d7e0d2ea5a0a462bbaa4a916826 /arch/mips/mm | |
parent | 70f2fe3a26248724d8a5019681a869abdaf3e89a (diff) |
MIPS: fix case mismatch in local_r4k_flush_icache_range()
Currently, Loongson-2 call protected_blast_icache_range() and others
call protected_loongson23_blast_icache_range(), but I think the correct
behavior should be the opposite. BTW, Loongson-3's cache-ops is
compatible with MIPS64, but not compatible with Loongson-2. So, rename
xxx_loongson23_yyy things to xxx_loongson2_yyy.
The patch fixes early boot hang with 3.13-rc1, introduced in commit
14bd8c082016 ("MIPS: Loongson: Get rid of Loongson 2 #ifdefery all over
arch/mips").
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Acked-by: John Crispin <blogic@openwrt.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/mm')
-rw-r--r-- | arch/mips/mm/c-r4k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 62ffd20ea869..73f02da61baf 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -580,11 +580,11 @@ static inline void local_r4k_flush_icache_range(unsigned long start, unsigned lo | |||
580 | else { | 580 | else { |
581 | switch (boot_cpu_type()) { | 581 | switch (boot_cpu_type()) { |
582 | case CPU_LOONGSON2: | 582 | case CPU_LOONGSON2: |
583 | protected_blast_icache_range(start, end); | 583 | protected_loongson2_blast_icache_range(start, end); |
584 | break; | 584 | break; |
585 | 585 | ||
586 | default: | 586 | default: |
587 | protected_loongson23_blast_icache_range(start, end); | 587 | protected_blast_icache_range(start, end); |
588 | break; | 588 | break; |
589 | } | 589 | } |
590 | } | 590 | } |