diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
| commit | 661af35e5fd878f915ed05dbbfe383f64133f98c (patch) | |
| tree | 956b7efd662b682224e61060552fdcf4201101bf /arch/mips/kernel/idle.c | |
| parent | ca5d25642e212f73492d332d95dc90ef46a0e8dc (diff) | |
| parent | f296e7c48d3155991b99f41372e1786c5be03457 (diff) | |
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/idle.c')
| -rw-r--r-- | arch/mips/kernel/idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c index 0b9082b6b683..368c88b7eb6c 100644 --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c | |||
| @@ -186,6 +186,7 @@ void __init check_wait(void) | |||
| 186 | case CPU_PROAPTIV: | 186 | case CPU_PROAPTIV: |
| 187 | case CPU_P5600: | 187 | case CPU_P5600: |
| 188 | case CPU_M5150: | 188 | case CPU_M5150: |
| 189 | case CPU_QEMU_GENERIC: | ||
| 189 | cpu_wait = r4k_wait; | 190 | cpu_wait = r4k_wait; |
| 190 | if (read_c0_config7() & MIPS_CONF7_WII) | 191 | if (read_c0_config7() & MIPS_CONF7_WII) |
| 191 | cpu_wait = r4k_wait_irqoff; | 192 | cpu_wait = r4k_wait_irqoff; |