Commit 1ea61ea2 authored Nov 14, 2017 by Josh Poimboeuf Committed by Michael Ellerman Dec 11, 2017

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: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
[mpe: Change noop to nop, as that's the name of the instruction]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent b9eab08d

arch/powerpc/kernel/module_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -501,8 +501,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 nop after call, got %08x at %pS\n",
		me->name, *instruction, instruction);
		return 0;
		}
		/* ld r2,R2_STACK_OFFSET(r1) */