powerpc: module: fix stubs for BE

PATCH New Rusty Russell 1 participant 1 message May 12, 2014 PowerPC

Share & tools

Rusty Russell

author

2014-05-12 07:45 UTC #0 lore raw

PATCH 1/1 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 b1ce369e82 ("powerpc: modules: use r12 for stub jump address.)

Reported-by Alistair Popple <[email protected]>

Signed-off-by Rusty Russell <[email protected]>

Tested-by Alistair Popple <[email protected]>

arch/powerpc/kernel/module_64.c +1 -1

index ef349d0..077d2ce 100644
@@ -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) */
 #endif
 	0x7d8903a6,			/* mtctr   r12 */
 	0x4e800420			/* bctr */