| Message ID | 20201130004404.30953-1-jniethe5@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fe18a35e685c9bdabc8b11b3e19deb85a068b75d |
| Headers | show |
| Series | powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (2551450071df2dabd7134e548ac209688ac6741d) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| snowpatch_ozlabs/needsstable | warning | Please consider tagging this patch for stable! |
On Mon, 30 Nov 2020 11:44:04 +1100, Jordan Niethe wrote: > 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. Applied to powerpc/next. [1/1] powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S https://git.kernel.org/powerpc/c/fe18a35e685c9bdabc8b11b3e19deb85a068b75d cheers
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 3bae6286c17c..f63d01c78398 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -995,7 +995,7 @@ start_here_common: bl start_kernel /* Not reached */ - trap +0: trap EMIT_BUG_ENTRY 0b, __FILE__, __LINE__, 0 .previous
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> --- arch/powerpc/kernel/head_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)