aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/smp.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-11 09:05:29 -0800
committerOlof Johansson <olof@lixom.net>2013-02-11 09:05:29 -0800
commit4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch)
treefeb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/kernel/smp.c
parent37a42fca282cb37c14d997ca9299bdc6617815bb (diff)
parent9e47b8bf9815523a5816f2f83e73b13812d74014 (diff)
downloadvexpress-lsk-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.gz
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r--arch/arm/kernel/smp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index b7e3b506219..a77b0532f97 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -416,7 +416,8 @@ static void (*smp_cross_call)(const struct cpumask *, unsigned int);
void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned int))
{
- smp_cross_call = fn;
+ if (!smp_cross_call)
+ smp_cross_call = fn;
}
void arch_send_call_function_ipi_mask(const struct cpumask *mask)