diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 12:27:25 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 12:27:25 -0300 |
commit | 30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c (patch) | |
tree | 418c535ebc1a0001b7c448e1d7ff97cf79bff8fd /arch/powerpc/lib/test_emulate_step_exec_instr.S | |
parent | 66dfc517e8ec530b1d8d4776c05e3f264f38ecb8 (diff) | |
parent | aeba12b26c79fc35e07e511f692a8907037d95da (diff) |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/powerpc/lib/test_emulate_step_exec_instr.S')
-rw-r--r-- | arch/powerpc/lib/test_emulate_step_exec_instr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/test_emulate_step_exec_instr.S b/arch/powerpc/lib/test_emulate_step_exec_instr.S index 5473f9d03df3a..e2b646a4f7fa1 100644 --- a/arch/powerpc/lib/test_emulate_step_exec_instr.S +++ b/arch/powerpc/lib/test_emulate_step_exec_instr.S @@ -16,7 +16,7 @@ _GLOBAL(exec_instr) /* * Stack frame layout (INT_FRAME_SIZE bytes) - * In-memory pt_regs (SP + STACK_FRAME_OVERHEAD) + * In-memory pt_regs (SP + STACK_INT_FRAME_REGS) * Scratch space (SP + 8) * Back chain (SP + 0) */ |