From 5f0301f066b6c1ee906d94da544921ebad14f4a1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 12 May 2014 17:15:02 +0930 Subject: [PATCH] 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: e7ef65f45d ("powerpc: modules: use r12 for stub jump address.) Reported-by: Alistair Popple Signed-off-by: Rusty Russell Tested-by: Alistair Popple Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/kernel/module_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index ef349d0771297..077d2ce6c5a7c 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) */ #endif 0x7d8903a6, /* mtctr r12 */ 0x4e800420 /* bctr */ -- 2.39.5