Skip to content

Commit 2d0de93

Browse files
committed
Merge tag 'riscv-for-linus-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt: - A fix to properly ensure a single CPU is running during patch_text(). - A defconfig update to include RPMSG_CTRL when RPMSG_CHAR was set, necessary after a recent refactoring. * tag 'riscv-for-linus-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: RISC-V: configs: Configs that had RPMSG_CHAR now get RPMSG_CTRL riscv: patch_text: Fixup last cpu should be master
2 parents 66c2112 + ac0280a commit 2d0de93

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

arch/riscv/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ CONFIG_VIRTIO_BALLOON=y
101101
CONFIG_VIRTIO_INPUT=y
102102
CONFIG_VIRTIO_MMIO=y
103103
CONFIG_RPMSG_CHAR=y
104+
CONFIG_RPMSG_CTRL=y
104105
CONFIG_RPMSG_VIRTIO=y
105106
CONFIG_EXT4_FS=y
106107
CONFIG_EXT4_FS_POSIX_ACL=y

arch/riscv/configs/rv32_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ CONFIG_VIRTIO_BALLOON=y
9393
CONFIG_VIRTIO_INPUT=y
9494
CONFIG_VIRTIO_MMIO=y
9595
CONFIG_RPMSG_CHAR=y
96+
CONFIG_RPMSG_CTRL=y
9697
CONFIG_RPMSG_VIRTIO=y
9798
CONFIG_EXT4_FS=y
9899
CONFIG_EXT4_FS_POSIX_ACL=y

arch/riscv/kernel/patch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static int patch_text_cb(void *data)
104104
struct patch_insn *patch = data;
105105
int ret = 0;
106106

107-
if (atomic_inc_return(&patch->cpu_count) == 1) {
107+
if (atomic_inc_return(&patch->cpu_count) == num_online_cpus()) {
108108
ret =
109109
patch_text_nosync(patch->addr, &patch->insn,
110110
GET_INSN_LENGTH(patch->insn));

0 commit comments

Comments
 (0)