From: Palmer Dabbelt <palmerdabbelt@google.com>
Date: Thu, 22 Jul 2021 05:18:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'riscv/riscv-fix-32bit' into fixes
X-Git-Tag: accepted/tizen/unified/20230118.172025~6608^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=444818b599189fd8b6c814da542ff8cfc9fe67d4;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'riscv/riscv-fix-32bit' into fixes

This contains a single fix for 32-bit boot.  It happens this was already
fixed by c9811e379b21 ("riscv: Add mem kernel parameter support"), but
the bug existed before that feature addition so I've applied the patch
earlier and then merged it in (which results in a conflict, which is
fixed via not changing the resulting tree).

* riscv/riscv-fix-32bit:
  riscv: Fix 32-bit RISC-V boot failure
---

444818b599189fd8b6c814da542ff8cfc9fe67d4