Merge remote-tracking branch 'arm/for-next'

[karo-tx-linux.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index df6cd7307bd7e0c53b73569cf97a1c4c83a27db9..da1d1aa20ad957ccd7021815014d12530de4f3a1 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -759,8 +759,10 @@ void __init setup_arch(char **cmdline_p)
        unflatten_device_tree();
 
 #ifdef CONFIG_SMP
-       if (is_smp())
+       if (is_smp()) {
+               smp_set_ops(mdesc->smp);
                smp_init_cpus();
+       }
 #endif
 
        if (!is_smp())