Commit 872aa779 authored May 12, 2014 by Rusty Russell Committed by Benjamin Herrenschmidt May 20, 2014

powerpc/module: Fix stubs for BE



A simple patch which was supposed to swap r12 and r11 also
inexplicably changed the offset by two bytes.  This instruction
(to load r2) isn't used in LE, so it wasn't noticed.

Fixes: b1ce369e ("powerpc: modules: use r12 for stub jump address.)
Reported-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Tested-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent bd0c30e3

arch/powerpc/kernel/module_64.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ static u32 ppc64_stub_insns[] = {
	0xe98b0020, /* ld r12,32(r11) */		0xe98b0020, /* ld r12,32(r11) */
	#if !defined(_CALL_ELF) \|\| _CALL_ELF != 2		#if !defined(_CALL_ELF) \|\| _CALL_ELF != 2
	/* Set up new r2 from function descriptor */		/* Set up new r2 from function descriptor */
	0xe84b0026, /* ld r2,40(r11) */		0xe84b0028, /* ld r2,40(r11) */
	#endif		#endif
	0x7d8903a6, /* mtctr r12 */		0x7d8903a6, /* mtctr r12 */
	0x4e800420 /* bctr */		0x4e800420 /* bctr */