From: Jordan Niethe Date: Mon, 30 Nov 2020 00:44:04 +0000 (+1100) Subject: powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S X-Git-Tag: Ubuntu-5.4.0-66.74~283 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4b91d41324526474146923bdb43a504afe6b3e83;p=mirror_ubuntu-focal-kernel.git powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S BugLink: https://bugs.launchpad.net/bugs/1910822 [ Upstream commit fe18a35e685c9bdabc8b11b3e19deb85a068b75d ] Commit 63ce271b5e37 ("powerpc/prom: convert PROM_BUG() to standard trap") added an EMIT_BUG_ENTRY for the trap after the branch to start_kernel(). The EMIT_BUG_ENTRY was for the address "0b", however the trap was not labeled with "0". Hence the address used for bug is in relative_toc() where the previous "0" label is. Label the trap as "0" so the correct address is used. Fixes: 63ce271b5e37 ("powerpc/prom: convert PROM_BUG() to standard trap") Signed-off-by: Jordan Niethe Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20201130004404.30953-1-jniethe5@gmail.com Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Kelsey Skunberg --- diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index d61b3b13a6ec..9019f1395d39 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -992,7 +992,7 @@ start_here_common: bl start_kernel /* Not reached */ - trap +0: trap EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0 /*