diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-11-12 11:36:03 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-11-12 11:36:03 +0100 |
| commit | da34232641a91ca785a787c23c158488e459b938 (patch) | |
| tree | 8be0342fa443f92a7e0f36a5c11cf094af2747d4 /arch/mips/kernel/idle.c | |
| parent | MIPS: idle: add case for CPU_5KE (diff) | |
| parent | MIPS: OCTEON: omit ELF NOTE segments (diff) | |
| download | linux-da34232641a91ca785a787c23c158488e459b938.tar.xz linux-da34232641a91ca785a787c23c158488e459b938.zip | |
Merge branch '4.3-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/idle.c')
| -rw-r--r-- | arch/mips/kernel/idle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c index 35af61530de1..46794d64c0bf 100644 --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c @@ -171,7 +171,6 @@ void __init check_wait(void) case CPU_BMIPS3300: case CPU_BMIPS4350: case CPU_BMIPS4380: - case CPU_BMIPS5000: case CPU_CAVIUM_OCTEON: case CPU_CAVIUM_OCTEON_PLUS: case CPU_CAVIUM_OCTEON2: @@ -182,7 +181,9 @@ void __init check_wait(void) case CPU_XLP: cpu_wait = r4k_wait; break; - + case CPU_BMIPS5000: + cpu_wait = r4k_wait_irqoff; + break; case CPU_RM7000: cpu_wait = rm7k_wait_irqoff; break; |