aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/smp.c
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-02-14 11:25:58 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2012-04-27 13:35:32 +0100
commitbfa05f4f3398b61205567f3a5cad90804a5a1fdc (patch)
treeaa1f0e73fea7f29db1e24d1a12ee2fa9124bf922 /arch/arm/kernel/smp.c
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
downloadvexpress-lsk-bfa05f4f3398b61205567f3a5cad90804a5a1fdc.tar.gz
ARM: local timers: reserve local_timer_register() to SMP
When running an SMP_ON_UP enabled kernel on UP, or with nosmp passed to the kernel, we want to be able to detect that a local timer is not going to be used (local timers are only used on SMP platforms), so we could register it as a global timer instead. Return -ENXIO when the above case is detected. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r--arch/arm/kernel/smp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index addbbe8028c..11c4148b8ab 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -454,6 +454,9 @@ static struct local_timer_ops *lt_ops;
#ifdef CONFIG_LOCAL_TIMERS
int local_timer_register(struct local_timer_ops *ops)
{
+ if (!is_smp() || !setup_max_cpus)
+ return -ENXIO;
+
if (lt_ops)
return -EBUSY;