Commit 1ea61ea2 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Michael Ellerman

powerpc/modules: Improve restore_r2() error message

Print the function address associated with the restore_r2() error to
make it easier to debug the problem.

Also clarify the wording a bit.

Before:

  module_64: patch_foo: Expect noop after relocate, got 3c820000

After:

  module_64: patch_foo: Expected nop after call, got 7c630034 at netdev_has_upper_dev+0x54/0xb0 [patch_foo]
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
[mpe: Change noop to nop, as that's the name of the instruction]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b9eab08d
...@@ -501,8 +501,8 @@ static int restore_r2(u32 *instruction, struct module *me) ...@@ -501,8 +501,8 @@ static int restore_r2(u32 *instruction, struct module *me)
return 1; return 1;
if (*instruction != PPC_INST_NOP) { if (*instruction != PPC_INST_NOP) {
pr_err("%s: Expect noop after relocate, got %08x\n", pr_err("%s: Expected nop after call, got %08x at %pS\n",
me->name, *instruction); me->name, *instruction, instruction);
return 0; return 0;
} }
/* ld r2,R2_STACK_OFFSET(r1) */ /* ld r2,R2_STACK_OFFSET(r1) */
......
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