Message ID | 20171114092910.20399-4-kamalesh@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 1ea61ea23985c0f15c027e4c0ac02224efdfb243 |
Headers | show |
Series | ppc64le: Add REL24 relocation support of livepatch symbols | expand |
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> writes: > From: Josh Poimboeuf <jpoimboe@redhat.com> > > 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 noop after call, got 7c630034 at netdev_has_upper_dev+0x54/0xb0 [patch_foo] I renamed noop to nop, as that's the name of the instruction. cheers
On Tue, 2017-11-14 at 09:29:10 UTC, Kamalesh Babulal wrote: > From: Josh Poimboeuf <jpoimboe@redhat.com> > > 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 noop after call, got 7c630034 at netdev_has_upper_dev+0x54/0xb0 [patch_foo] > > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/1ea61ea23985c0f15c027e4c0ac022 cheers
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 9e5391f..dad3ea5 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c @@ -494,8 +494,8 @@ static int restore_r2(u32 *instruction, struct module *me) return 1; if (*instruction != PPC_INST_NOP) { - pr_err("%s: Expect noop after relocate, got %08x\n", - me->name, *instruction); + pr_err("%s: Expected noop after call, got %08x at %pS\n", + me->name, *instruction, instruction); return 0; } /* ld r2,R2_STACK_OFFSET(r1) */