path: root/arch
diff options
authorLinus Torvalds <>2020-05-22 11:08:26 -0700
committerLinus Torvalds <>2020-05-22 11:08:26 -0700
commitb09ca17a2a082299c787025b6c3e614a24a24ca8 (patch)
tree1aaf05ea769347691996c8626240ef170245b674 /arch
parent4286d192c803571e8ca43b0f1f8ea04d663a278a (diff)
parent8356c379cfba8b1b90b0a2423f6afbbe2cdc5d91 (diff)
Merge tag 'riscv-for-linus-5.7-rc7' of git://
Pull RISC-V fixes from Palmer Dabbelt: "Two fixes: - Another !MMU build fix that was a straggler from last week - A fix to use the "register" keyword for the GP global register variable" * tag 'riscv-for-linus-5.7-rc7' of git:// RISC-V: gp_in_global needs register keyword riscv: Fix print_vm_layout build error if NOMMU
Diffstat (limited to 'arch')
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
index 610c11e91606..824d117cf202 100644
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
@@ -22,7 +22,7 @@
#include <asm/switch_to.h>
#include <asm/thread_info.h>
-unsigned long gp_in_global __asm__("gp");
+register unsigned long gp_in_global __asm__("gp");
extern asmlinkage void ret_from_fork(void);
extern asmlinkage void ret_from_kernel_thread(void);
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 27a334106708..736de6c8739f 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -47,7 +47,7 @@ static void setup_zero_page(void)
memset((void *)empty_zero_page, 0, PAGE_SIZE);
+#if defined(CONFIG_MMU) && defined(CONFIG_DEBUG_VM)
static inline void print_mlk(char *name, unsigned long b, unsigned long t)
pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,