Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements"