Commit a7a4f1c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - avoid passing -mno-relax to compilers that don't support it

 - a comment fix

* tag 'riscv-for-linus-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fix comment regarding kernel mapping overlapping with IS_ERR_VALUE
  riscv: kexec: do not add '-mno-relax' flag if compiler doesn't support it
parents 118516e2 fdf3a7a1

arch/riscv/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ endif 
CFLAGS_syscall_table.o	+= $(call cc-option,-Wno-override-init,)



ifdef CONFIG_KEXEC

AFLAGS_kexec_relocate.o := -mcmodel=medany -mno-relax

AFLAGS_kexec_relocate.o := -mcmodel=medany $(call cc-option,-mno-relax)

endif



extra-y += head.o

arch/riscv/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void __init setup_bootmem(void) 
	 * if end of dram is equal to maximum addressable memory.  For 64-bit

	 * kernel, this problem can't happen here as the end of the virtual

	 * address space is occupied by the kernel mapping then this check must

	 * be done in create_kernel_page_table.

	 * be done as soon as the kernel mapping base address is determined.

	 */

	max_mapped_addr = __pa(~(ulong)0);

	if (max_mapped_addr == (phys_ram_end - 1))