Commit fe18a35e authored by Jordan Niethe's avatar Jordan Niethe Committed by Michael Ellerman

powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S

Commit 63ce271b ("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: 63ce271b ("powerpc/prom: convert PROM_BUG() to standard trap")
Signed-off-by: default avatarJordan Niethe <jniethe5@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201130004404.30953-1-jniethe5@gmail.com
parent 65d2150c
...@@ -995,7 +995,7 @@ start_here_common: ...@@ -995,7 +995,7 @@ start_here_common:
bl start_kernel bl start_kernel
/* Not reached */ /* Not reached */
trap 0: trap
EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0 EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0
.previous .previous
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment