From: Guo Ren <guoren@xxxxxxxxxxxxxxxxx>
Signed-off-by: Guo Ren <guoren@xxxxxxxxxxxxxxxxx>
---
arch/riscv/Kconfig | 1 -
arch/riscv/include/asm/page.h | 2 +-
init/main.c | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 5106eab17811..acd6aa60ed84 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -160,7 +160,6 @@ config RISCV
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
select UACCESS_MEMCPY if !MMU
- select ZONE_DMA32 if 64BIT
config CLANG_SUPPORTS_DYNAMIC_FTRACE
def_bool CC_IS_CLANG
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
index 7c535e88cf91..f9af3e6b6e21 100644
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@ -106,7 +106,7 @@ typedef struct page *pgtable_t;
* We override this value as its generic definition uses __pa too early in
* the boot process (before kernel_map.va_pa_offset is set).
*/
-#define MIN_MEMBLOCK_ADDR 0
+#define MIN_MEMBLOCK_ADDR 0x60400000ULL
#endif
#ifdef CONFIG_MMU
diff --git a/init/main.c b/init/main.c
index ad920fac325c..f88f0227e398 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1496,6 +1496,8 @@ static int __ref kernel_init(void *unused)
!try_to_run_init_process("/bin/sh"))
return 0;
+ show_mem(0, NULL);
+
panic("No working init found. Try passing init= option to kernel. "
"See Linux Documentation/admin-guide/init.rst for guidance.");
}
--
2.36.1
