tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a389e546 56f81458

+3 -3
+1 -1
arch/riscv/include/asm/uaccess.h
··· 165 165 might_fault(); \ 166 166 access_ok(__p, sizeof(*__p)) ? \ 167 167 __get_user((x), __p) : \ 168 - ((x) = 0, -EFAULT); \ 168 + ((x) = (__force __typeof__(x))0, -EFAULT); \ 169 169 }) 170 170 171 171 #define __put_user_asm(insn, x, ptr, err) \
+2 -2
arch/riscv/kernel/probes/simulate-insn.h
··· 31 31 } while (0) 32 32 33 33 __RISCV_INSN_FUNCS(c_j, 0xe003, 0xa001); 34 - __RISCV_INSN_FUNCS(c_jr, 0xf007, 0x8002); 34 + __RISCV_INSN_FUNCS(c_jr, 0xf07f, 0x8002); 35 35 __RISCV_INSN_FUNCS(c_jal, 0xe003, 0x2001); 36 - __RISCV_INSN_FUNCS(c_jalr, 0xf007, 0x9002); 36 + __RISCV_INSN_FUNCS(c_jalr, 0xf07f, 0x9002); 37 37 __RISCV_INSN_FUNCS(c_beqz, 0xe003, 0xc001); 38 38 __RISCV_INSN_FUNCS(c_bnez, 0xe003, 0xe001); 39 39 __RISCV_INSN_FUNCS(c_ebreak, 0xffff, 0x9002);