diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-14 20:14:07 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-14 20:14:07 +0200 |
commit | 2772d7df3c93f15e5b2119bd9e14724db6a21a04 (patch) | |
tree | eab0a348c25750f24842f068d6cf9352e8764555 /Documentation | |
parent | Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff) | |
parent | RISC-V: Don't include Zicsr or Zifencei in I from ACPI (diff) | |
download | linux-2772d7df3c93f15e5b2119bd9e14724db6a21a04.tar.xz linux-2772d7df3c93f15e5b2119bd9e14724db6a21a04.zip |
Merge tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- fix a formatting error in the hwprobe documentation
- fix a spurious warning in the RISC-V PMU driver
- fix memory detection on rv32 (problem does not manifest on any known
system)
- avoid parsing legacy parsing of I in ACPI ISA strings
* tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
RISC-V: Don't include Zicsr or Zifencei in I from ACPI
riscv: mm: fix truncation warning on RV32
perf: RISC-V: Remove PERF_HES_STOPPED flag checking in riscv_pmu_start()
Documentation: RISC-V: hwprobe: Fix a formatting error
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/riscv/hwprobe.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst index 19165ebd82ba..933c715065d6 100644 --- a/Documentation/riscv/hwprobe.rst +++ b/Documentation/riscv/hwprobe.rst @@ -49,7 +49,7 @@ The following keys are defined: privileged ISA, with the following known exceptions (more exceptions may be added, but only if it can be demonstrated that the user ABI is not broken): - * The :fence.i: instruction cannot be directly executed by userspace + * The ``fence.i`` instruction cannot be directly executed by userspace programs (it may still be executed in userspace via a kernel-controlled mechanism such as the vDSO). |