Commit a389e546 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - use the correct mask for c.jr/c.jalr when decoding instructions

 - build fix for get_user() to avoid a sparse warning

* tag 'riscv-for-linus-6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: uaccess: fix type of 0 variable on error in get_user()
  riscv, kprobes: Stricter c.jr/c.jalr decoding
parents 56f81458 b9b916ae

arch/riscv/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ do { \ 
	might_fault();						\

	access_ok(__p, sizeof(*__p)) ?		\

		__get_user((x), __p) :				\

		((x) = 0, -EFAULT);				\

		((x) = (__force __typeof__(x))0, -EFAULT);	\

})



#define __put_user_asm(insn, x, ptr, err)			\

arch/riscv/kernel/probes/simulate-insn.h

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ __RISCV_INSN_FUNCS(fence, 0x7f, 0x0f); 
	} while (0)



__RISCV_INSN_FUNCS(c_j,		0xe003, 0xa001);

__RISCV_INSN_FUNCS(c_jr,	0xf007, 0x8002);

__RISCV_INSN_FUNCS(c_jr,	0xf07f, 0x8002);

__RISCV_INSN_FUNCS(c_jal,	0xe003, 0x2001);

__RISCV_INSN_FUNCS(c_jalr,	0xf007, 0x9002);

__RISCV_INSN_FUNCS(c_jalr,	0xf07f, 0x9002);

__RISCV_INSN_FUNCS(c_beqz,	0xe003, 0xc001);

__RISCV_INSN_FUNCS(c_bnez,	0xe003, 0xe001);

__RISCV_INSN_FUNCS(c_ebreak,	0xffff, 0x9002);