Skip to content

Commit

Permalink
powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S
Browse files Browse the repository at this point in the history
[ Upstream commit fe18a35 ]

Commit 63ce271 ("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: 63ce271 ("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>
  • Loading branch information
iamjpn authored and gregkh committed Dec 30, 2020
1 parent 4968cc5 commit 40f9ac2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/head_64.S
Expand Up @@ -992,7 +992,7 @@ start_here_common:
bl start_kernel

/* Not reached */
trap
0: trap
EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0

/*
Expand Down

0 comments on commit 40f9ac2

Please sign in to comment.