4.20-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Aurelien Jarno <aurel...@aurel32.net>

commit 8a644c64a9f1aefb99fdc4413e6b7fee17809e38 upstream.

Commit 62cac480f33f ("MIPS: kexec: Make a framework for both jumping and
halting on nonboot CPUs") broke the build of the OCTEON platform as
the relocated_kexec_smp_wait() is now static and not longer exported in
kexec.h.

Replace it by kexec_reboot() like it has been done in other places.

Fixes: 62cac480f33f ("MIPS: kexec: Make a framework for both jumping and 
halting on nonboot CPUs")
Signed-off-by: Aurelien Jarno <aurel...@aurel32.net>
Signed-off-by: Paul Burton <paul.bur...@mips.com>
Cc: linux-m...@vger.kernel.org
Cc: Dengcheng Zhu <d...@wavecomp.com>
Cc: r...@linux-mips.org
Cc: sta...@vger.kernel.org # 4.20+
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/mips/cavium-octeon/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -96,7 +96,7 @@ static void octeon_kexec_smp_down(void *
        "       sync                                            \n"
        "       synci   ($0)                                    \n");
 
-       relocated_kexec_smp_wait(NULL);
+       kexec_reboot();
 }
 #endif
 


Reply via email to