Commit b09ca17a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'riscv-for-linus-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

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://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: gp_in_global needs register keyword
  riscv: Fix print_vm_layout build error if NOMMU
parents 4286d192 8356c379
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <asm/thread_info.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_fork(void);
extern asmlinkage void ret_from_kernel_thread(void); extern asmlinkage void ret_from_kernel_thread(void);
......
...@@ -47,7 +47,7 @@ static void setup_zero_page(void) ...@@ -47,7 +47,7 @@ static void setup_zero_page(void)
memset((void *)empty_zero_page, 0, PAGE_SIZE); memset((void *)empty_zero_page, 0, PAGE_SIZE);
} }
#ifdef CONFIG_DEBUG_VM #if defined(CONFIG_MMU) && defined(CONFIG_DEBUG_VM)
static inline void print_mlk(char *name, unsigned long b, unsigned long t) 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, pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment