kmod: move #ifdef CONFIG_MODULES wrapper to Makefile

[mirror_ubuntu-bionic-kernel.git] / kernel / sched / idle.c

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 6c23e30c0e5cc5addb9f3bf027161bb366686ef6..257f4f0b4532b0428a8ff3c72513b0a54cb0029d 100644 (file)
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -158,7 +158,7 @@ static void cpuidle_idle_call(void)
        }
 
        /*
-        * Suspend-to-idle ("freeze") is a system state in which all user space
+        * Suspend-to-idle ("s2idle") is a system state in which all user space
         * has been frozen, all I/O devices have been suspended and the only
         * activity happens here and in iterrupts (if any).  In that case bypass
         * the cpuidle governor and go stratight for the deepest idle state
@@ -167,9 +167,9 @@ static void cpuidle_idle_call(void)
         * until a proper wakeup interrupt happens.
         */
 
-       if (idle_should_freeze() || dev->use_deepest_state) {
-               if (idle_should_freeze()) {
-                       entered_state = cpuidle_enter_freeze(drv, dev);
+       if (idle_should_enter_s2idle() || dev->use_deepest_state) {
+               if (idle_should_enter_s2idle()) {
+                       entered_state = cpuidle_enter_s2idle(drv, dev);
                        if (entered_state > 0) {
                                local_irq_enable();
                                goto exit_idle;