arm64: unify smp_psci.c and psci.c
authorMark Rutland <mark.rutland@arm.com>
Thu, 24 Oct 2013 19:30:14 +0000 (20:30 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 11 Dec 2013 21:09:37 +0000 (21:09 +0000)
commit20aab0887ba6b06584fea3a8b46268b5662a1149
tree404f2682b75966dfbdfef0bbe1e9de58086c9064
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376
arm64: unify smp_psci.c and psci.c

The functions in psci.c are only used from smp_psci.c, and smp_psci
cannot function without psci.c. Additionally psci.c is built when !SMP,
where it's expected that cpu_suspend may be useful.

This patch unifies the two files, removing pointless duplication and
paving the way for PSCI support in UP systems.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 00ef54bb97389bfe8894272f48496f4191aae946)
Signed-off-by: Mark Brown <broonie@linaro.org>
arch/arm64/include/asm/psci.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/psci.c
arch/arm64/kernel/smp_psci.c [deleted file]