From: Palmer Dabbelt <palmerdabbelt@google.com>
Date: Wed, 2 Jun 2021 04:17:08 +0000 (-0700)
Subject: Merge remote-tracking branch 'riscv/riscv-wx-mappings' into fixes
X-Git-Tag: v5.15~950^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=160ce364167fabf8df5bebfff1b38fd5d8c146c9;p=platform%2Fkernel%2Flinux-starfive.git

Merge remote-tracking branch 'riscv/riscv-wx-mappings' into fixes

This single commit is shared between fixes and for-next, as it fixes a
concrete bug while likely conflicting with a more invasive cleanup to
avoid these oddball mappings entirely.

* riscv/riscv-wx-mappings:
  riscv: mm: Fix W+X mappings at boot
---

160ce364167fabf8df5bebfff1b38fd5d8c146c9