korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 01:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/module: Fix stubs for BE

Browse Source 
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@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>
This commit is contained in:
Rusty Russell 2014-05-12 17:15:02 +09:30 committed by Benjamin Herrenschmidt
parent bd0c30e310
commit 872aa779bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/module_64.c
View File

@ -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 */