Unverified Commit 4a92a879 authored by Charlie Jenkins's avatar Charlie Jenkins Committed by Palmer Dabbelt
Browse files

riscv: Correct type casting in module loading 



Use __le16 with le16_to_cpu.

Fixes: 8fd6c514 ("riscv: Add remaining module relocations")
Signed-off-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Reviewed-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Tested-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Tested-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Link: https://lore.kernel.org/r/20231127-module_linking_freeing-v4-2-a2ca1d7027d0@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent d8792a57

arch/riscv/kernel/module.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static bool riscv_insn_valid_32bit_offset(ptrdiff_t val) 


static int riscv_insn_rmw(void *location, u32 keep, u32 set)

{

	u16 *parcel = location;

	__le16 *parcel = location;

	u32 insn = (u32)le16_to_cpu(parcel[0]) | (u32)le16_to_cpu(parcel[1]) << 16;



	insn &= keep;
@@ -68,7 +68,7 @@ static int riscv_insn_rmw(void *location, u32 keep, u32 set) 


static int riscv_insn_rvc_rmw(void *location, u16 keep, u16 set)

{

	u16 *parcel = location;

	__le16 *parcel = location;

	u16 insn = le16_to_cpu(*parcel);



	insn &= keep;