aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/cpuidle.h
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2015-02-02 16:32:46 +0100
committerDaniel Lezcano <daniel.lezcano@linaro.org>2015-03-24 10:16:09 +0100
commitc9d62161490e2b74e51bcaf2acea07e27ce833eb (patch)
tree84c18f183ea3cd9bc08c726729e31df525d30a7a /arch/arm64/include/asm/cpuidle.h
parentARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function (diff)
downloadlinux-dev-c9d62161490e2b74e51bcaf2acea07e27ce833eb.tar.xz
linux-dev-c9d62161490e2b74e51bcaf2acea07e27ce833eb.zip
ARM64: cpuidle: Rename cpu_init_idle to a common function name
With this change the cpuidle-arm64.c file calls the same function name for both ARM and ARM64. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Kevin Hilman <khilman@linaro.org> Acked-by: Rob Herring <robherring2@gmail.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/cpuidle.h')
-rw-r--r--arch/arm64/include/asm/cpuidle.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 460a38bb84b9..141b2fcabaa6 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
#include <asm/proc-fns.h>
#ifdef CONFIG_CPU_IDLE
-extern int cpu_init_idle(unsigned int cpu);
+extern int arm_cpuidle_init(unsigned int cpu);
extern int cpu_suspend(unsigned long arg);
#else
-static inline int cpu_init_idle(unsigned int cpu)
+static inline int arm_cpuidle_init(unsigned int cpu)
{
return -EOPNOTSUPP;
}