Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index c4ceccfa3828..09ce45980758 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -236,3 +236,14 @@ void arch_cpu_idle(void)
         else
                 local_irq_enable();
 }
+
+#ifdef CONFIG_CPU_IDLE
+
+int mips_cpuidle_wait_enter(struct cpuidle_device *dev,
+                            struct cpuidle_driver *drv, int index)
+{
+        arch_cpu_idle();
+        return index;
+}
+
+#endif