powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S
authorJordan Niethe <jniethe5@gmail.com>
Mon, 30 Nov 2020 00:44:04 +0000 (11:44 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:53:32 +0000 (11:53 +0100)
commit746ef5ac254c01cef49d85dde8b321475133c752
treefb959be1f3558de8ef4187f9fd935a89e32843d0
parent668f649850ae477df13155b2ee416c43331a291d
powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S

[ 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 <jniethe5@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201130004404.30953-1-jniethe5@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/kernel/head_64.S