[PATCH] powerpc: module: fix stubs for BE

Rusty Russell rusty at rustcorp.com.au
Mon May 12 17:45:02 EST 2014

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: b1ce369e82 ("powerpc: modules: use r12 for stub jump address.)
Reported-by: Alistair Popple <alistair at popple.id.au>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Tested-by: Alistair Popple <alistair at popple.id.au>

diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index ef349d0..077d2ce 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -134,7 +134,7 @@ static u32 ppc64_stub_insns[] = {
 	0xe98b0020,			/* ld      r12,32(r11) */
 #if !defined(_CALL_ELF) || _CALL_ELF != 2
 	/* Set up new r2 from function descriptor */
-	0xe84b0026,			/* ld      r2,40(r11) */
+	0xe84b0028,			/* ld      r2,40(r11) */
 	0x7d8903a6,			/* mtctr   r12 */
 	0x4e800420			/* bctr */

More information about the Linuxppc-dev mailing list