[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190121122501.551202614@linuxfoundation.org>
Date: Mon, 21 Jan 2019 14:42:45 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Aurelien Jarno <aurelien@...el32.net>,
Paul Burton <paul.burton@...s.com>, linux-mips@...r.kernel.org,
Dengcheng Zhu <dzhu@...ecomp.com>, ralf@...ux-mips.org
Subject: [PATCH 4.20 051/111] MIPS: OCTEON: fix kexec support
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aurelien Jarno <aurelien@...el32.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 <aurelien@...el32.net>
Signed-off-by: Paul Burton <paul.burton@...s.com>
Cc: linux-mips@...r.kernel.org
Cc: Dengcheng Zhu <dzhu@...ecomp.com>
Cc: ralf@...ux-mips.org
Cc: stable@...r.kernel.org # 4.20+
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.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
Powered by blists - more mailing lists