]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 25 Oct 2013 10:33:19 +0000 (11:33 +0100)
commit04ccd5b1f19d5519f9a92aa6a851604c216c83d9
treef12fb227f252f52e50f52599c84282ad4fa665bd
parent54dac0e0ec823d1887e7e73c9c7e427c56fda74e
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>
arch/arm64/include/asm/psci.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/psci.c
arch/arm64/kernel/smp_psci.c [deleted file]