Commit 8fd00059 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix to make the ISA extension static keys writable after init. This
   manifests at least as a crash when loading modules (including KVM).

 - A fixup for a build warning related to a poorly formed comment in our
   perf driver.

* tag 'riscv-for-linus-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  perf: riscv legacy: fix kerneldoc comment warning
  riscv: Ensure isa-ext static keys are writable
parents ca052cfd 96264230

arch/riscv/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ unsigned long elf_hwcap __read_mostly; 
/* Host ISA bitmap */

static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly;



__ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);

DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);

EXPORT_SYMBOL(riscv_isa_ext_keys);



/**

drivers/perf/riscv_pmu_legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void pmu_legacy_ctr_start(struct perf_event *event, u64 ival) 
	local64_set(&hwc->prev_count, initial_val);

}



/**

/*

 * This is just a simple implementation to allow legacy implementations

 * compatible with new RISC-V PMU driver framework.

 * This driver only allows reading two counters i.e CYCLE & INSTRET.