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)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 3 Dec 2020 14:01:20 +0000 (01:01 +1100)
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
arch/powerpc/kernel/head_64.S

index 3bae628..f63d01c 100644 (file)
@@ -995,7 +995,7 @@ start_here_common:
        bl      start_kernel
 
        /* Not reached */
-       trap
+0:     trap
        EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0
        .previous