Skip to content

Commit cea1531

Browse files
rnavmpe
authored andcommitted
powerpc/64s: Fix instruction encoding for lis in ppc_function_entry()
'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: stable@vger.kernel.org # v3.16+ Reported-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Acked-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20210304020411.16796-1-naveen.n.rao@linux.vnet.ibm.com
1 parent fbda790 commit cea1531

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

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

7575
#define OP_RT_RA_MASK 0xffff0000UL
76-
#define LIS_R2 0x3c020000UL
76+
#define LIS_R2 0x3c400000UL
7777
#define ADDIS_R2_R12 0x3c4c0000UL
7878
#define ADDI_R2_R2 0x38420000UL
7979

0 commit comments

Comments
 (0)