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

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

Pull more RISC-V updates from Palmer Dabbelt:

 - A pair of defconfig additions, for NVMe and the EFI filesystem
   localization options.

 - A larger address space for stack randomization.

 - A cleanup to our install rules.

 - A DTS update for the Microchip Icicle board, to fix the serial
   console.

 - Support for build-time table sorting, which allows us to have
   __ex_table read-only.

* tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Move EXCEPTION_TABLE to RO_DATA segment
  riscv: Enable BUILDTIME_TABLE_SORT
  riscv: dts: microchip: mpfs-icicle: Fix serial console
  riscv: move the (z)install rules to arch/riscv/Makefile
  riscv: Improve stack randomisation on RV64
  riscv: defconfig: enable NLS_CODEPAGE_437, NLS_ISO8859_1
  riscv: defconfig: enable BLK_DEV_NVME
parents 4e1c7544 6f55ab36

Documentation/features/vm/ELF-ASLR/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    |    openrisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: | TODO |

    |       sparc: | TODO |

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config RISCV 
	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT

	select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU

	select BUILDTIME_TABLE_SORT if MMU

	select CLONE_BACKWARDS

	select CLINT_TIMER if !MMU

	select COMMON_CLK

arch/riscv/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -132,8 +132,11 @@ $(BOOT_TARGETS): vmlinux 
Image.%: Image

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



zinstall install:

	$(Q)$(MAKE) $(build)=$(boot) $@

install: install-image = Image

zinstall: install-image = Image.gz

install zinstall:

	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \

	$(boot)/$(install-image) System.map "$(INSTALL_PATH)"



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/riscv/boot/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -58,11 +58,3 @@ $(obj)/Image.lzo: $(obj)/Image FORCE 


$(obj)/loader.bin: $(obj)/loader FORCE

	$(call if_changed,objcopy)
 


install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"



zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image.gz System.map "$(INSTALL_PATH)"

arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

+5 −1
Original line number Diff line number Diff line
@@ -16,10 +16,14 @@ 


	aliases {

		ethernet0 = &emac1;

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

	};



	chosen {

		stdout-path = &serial0;

		stdout-path = "serial0:115200n8";

	};



	cpus {