]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
MIPS: Kconfig: Add missing MIPS_CPS dependencies to PM and cpuidle
authorMarkos Chandras <markos.chandras@imgtec.com>
Thu, 18 Sep 2014 15:09:49 +0000 (16:09 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 23 Oct 2014 17:58:05 +0000 (19:58 +0200)
The MIPS_CPS_PM and MIPS_CPS_CPUIDLE implementation should depend
on the MIPS_CPS symbol to avoid the following build problem

arch/mips/kernel/pm-cps.c: In function 'cps_pm_enter_state':
arch/mips/kernel/pm-cps.c:164:26: error: 'cpu_coherent_mask' undeclared
(first use in this function)
cpumask_clear_cpu(cpu, &cpu_coherent_mask);
                            ^
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/7798/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/Kconfig
drivers/cpuidle/Kconfig.mips

index ad6badb6be715735715e25ad3198b19e9f54191b..f43aa536c517437bc6778d6adb1d9e0212effc8c 100644 (file)
@@ -2066,6 +2066,7 @@ config MIPS_CPS
          support is unavailable.
 
 config MIPS_CPS_PM
+       depends on MIPS_CPS
        select MIPS_CPC
        bool
 
index 0e70ee28a5ca10f1690215b7de21ca5800d8681a..4102be01d06a03db5d98f91473b0083db81158d7 100644 (file)
@@ -3,7 +3,7 @@
 #
 config MIPS_CPS_CPUIDLE
        bool "CPU Idle driver for MIPS CPS platforms"
-       depends on CPU_IDLE
+       depends on CPU_IDLE && MIPS_CPS
        depends on SYS_SUPPORTS_MIPS_CPS
        select ARCH_NEEDS_CPU_IDLE_COUPLED if MIPS_MT
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP