Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / machine_kexec.c

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index de2b085ad7535da771a173ed855bcfdee4926c99..8bf3b7c098881b951df038575c6baf14e84df7b9 100644 (file)
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -46,7 +46,8 @@ int machine_kexec_prepare(struct kimage *image)
         * and implements CPU hotplug for the current HW. If not, we won't be
         * able to kexec reliably, so fail the prepare operation.
         */
-       if (num_possible_cpus() > 1 && !platform_can_cpu_hotplug())
+       if (num_possible_cpus() > 1 && platform_can_secondary_boot() &&
+           !platform_can_cpu_hotplug())
                return -EINVAL;
 
        /*