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 c9811e37 ("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