Skip to content

Commit a106547

Browse files
rnavksacilotto
authored andcommitted
powerpc/64s: Fix instruction encoding for lis in ppc_function_entry()
BugLink: https://bugs.launchpad.net/bugs/1920246 commit cea1531 upstream. 'lis r2,N' is 'addis r2,0,N' and the instruction encoding in the macro LIS_R2 is incorrect (it currently maps to 'addis r0,r2,N'). Fix the same. Fixes: c71b7ef ("powerpc: Add ABIv2 support to ppc_function_entry") Cc: [email protected] # v3.16+ Reported-by: Jiri Olsa <[email protected]> Signed-off-by: Naveen N. Rao <[email protected]> Acked-by: Segher Boessenkool <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>
1 parent 38ab317 commit a106547

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/include/asm/code-patching.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void __patch_exception(int exc, unsigned long addr);
7272
#endif
7373

7474
#define OP_RT_RA_MASK 0xffff0000UL
75-
#define LIS_R2 0x3c020000UL
75+
#define LIS_R2 0x3c400000UL
7676
#define ADDIS_R2_R12 0x3c4c0000UL
7777
#define ADDI_R2_R2 0x38420000UL
7878

0 commit comments

Comments
 (0)