[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1436014910-1201-3-git-send-email-jszhang@marvell.com>
Date: Sat, 4 Jul 2015 21:01:49 +0800
From: Jisheng Zhang <jszhang@...vell.com>
To: <linux@....linux.org.uk>, <will.deacon@....com>,
<mark.rutland@....com>, <daniel.lezcano@...aro.org>,
<Catalin.Marinas@....com>, <Lorenzo.Pieralisi@....com>
CC: <linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, Jisheng Zhang <jszhang@...vell.com>
Subject: [RFC PATCH 2/3] arm: psci: enable PSCI on UP systems
This is to make calls like eg cpu_suspend can be made functional on UP too.
Signed-off-by: Jisheng Zhang <jszhang@...vell.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists