From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933784AbbGHKO0 (ORCPT ); Wed, 8 Jul 2015 06:14:26 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:49874 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933701AbbGHKOW (ORCPT ); Wed, 8 Jul 2015 06:14:22 -0400 From: Jisheng Zhang To: , , , , , CC: , , Jisheng Zhang Subject: [PATCH 2/4] arm: psci: enable PSCI on UP systems Date: Wed, 8 Jul 2015 18:13:35 +0800 Message-ID: <1436350417-6712-3-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436350417-6712-1-git-send-email-jszhang@marvell.com> References: <1436350417-6712-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-07-08_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 kscore.is_bulkscore=0 kscore.compositescore=1 compositescore=0.9 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.9 spamscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1506180000 definitions=main-1507080168 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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