From mboxrd@z Thu Jan 1 00:00:00 1970 From: jszhang@marvell.com (Jisheng Zhang) Date: Wed, 8 Jul 2015 18:13:35 +0800 Subject: [PATCH 2/4] arm: psci: enable PSCI on UP systems In-Reply-To: <1436350417-6712-1-git-send-email-jszhang@marvell.com> References: <1436350417-6712-1-git-send-email-jszhang@marvell.com> Message-ID: <1436350417-6712-3-git-send-email-jszhang@marvell.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The PSCI can work on both SMP and UP. Now We'd like to enable PSCI features on UP systems. This is to prepare for next commit to implement cpuidle_ops with PSCI functions. Signed-off-by: Jisheng Zhang --- arch/arm/kernel/Makefile | 5 +---- arch/arm/kernel/psci.c | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index c57b2c0..2b1a60c 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -88,9 +88,6 @@ obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o -ifeq ($(CONFIG_ARM_PSCI),y) -obj-y += psci-call.o -obj-$(CONFIG_SMP) += psci.o -endif +obj-$(CONFIG_ARM_PSCI) += psci-call.o psci.o extra-y := $(head-y) vmlinux.lds diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c index 61c04b0..7f6ff02 100644 --- a/arch/arm/kernel/psci.c +++ b/arch/arm/kernel/psci.c @@ -47,6 +47,7 @@ * */ +#ifdef CONFIG_SMP extern void secondary_startup(void); static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) @@ -128,3 +129,4 @@ struct smp_operations __initdata psci_smp_ops = { .cpu_kill = psci_cpu_kill, #endif }; +#endif -- 2.1.4