diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-04-25 10:42:42 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-04-25 10:42:42 +0200 |
| commit | a126f7c41d80322b42ae0383ed3dcb17ee0296fc (patch) | |
| tree | 67f3605e72e01f7ec0b15af22d9d7b6ef8598b55 /arch/arm/kernel/smp_twd.c | |
| parent | Merge branch 'kvm-arm-fixes' of git://github.com/columbia/linux-kvm-arm into ... (diff) | |
| parent | ARM: mcpm: provide an interface to set the SMP ops at run time (diff) | |
| download | linux-a126f7c41d80322b42ae0383ed3dcb17ee0296fc.tar.xz linux-a126f7c41d80322b42ae0383ed3dcb17ee0296fc.zip | |
Merge branch 'mcpm' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/smp_twd.c')
| -rw-r--r-- | arch/arm/kernel/smp_twd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index c092115d903a..3f2565037480 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -22,6 +22,7 @@ #include <linux/of_irq.h> #include <linux/of_address.h> +#include <asm/smp_plat.h> #include <asm/smp_twd.h> #include <asm/localtimer.h> @@ -373,6 +374,9 @@ void __init twd_local_timer_of_register(void) struct device_node *np; int err; + if (!is_smp() || !setup_max_cpus) + return; + np = of_find_matching_node(NULL, twd_of_match); if (!np) return; |