From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2021 17:15:42 +0000 (-0800)
Subject: Merge tag 'riscv-for-linus-5.16-mw1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b89f311d7e25eb246376ac10de46d6ecc6b6ed5c;p=uclinux-h8%2Flinux.git

Merge tag 'riscv-for-linus-5.16-mw1' of git://git./linux/kernel/git/riscv/linux

Pull RISC-V updates from Palmer Dabbelt:

 - Support for time namespaces in the VDSO, along with some associated
   cleanups.

 - Support for building rv32 randconfigs.

 - Improvements to the XIP port that allow larger kernels to function

 - Various device tree cleanups for both the SiFive and Microchip boards

 - A handful of defconfig updates, including enabling Nouveau.

There are also various small cleanups.

* tag 'riscv-for-linus-5.16-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: defconfig: enable DRM_NOUVEAU
  riscv/vdso: Drop unneeded part due to merge issue
  riscv: remove .text section size limitation for XIP
  riscv: dts: sifive: add missing compatible for plic
  riscv: dts: microchip: add missing compatibles for clint and plic
  riscv: dts: sifive: drop duplicated nodes and properties in sifive
  riscv: dts: sifive: fix Unleashed board compatible
  riscv: dts: sifive: use only generic JEDEC SPI NOR flash compatible
  riscv: dts: microchip: use vendor compatible for Cadence SD4HC
  riscv: dts: microchip: drop unused pinctrl-names
  riscv: dts: microchip: drop duplicated MMC/SDHC node
  riscv: dts: microchip: fix board compatible
  riscv: dts: microchip: drop duplicated nodes
  dt-bindings: mmc: cdns: document Microchip MPFS MMC/SDHCI controller
  riscv: add rv32 and rv64 randconfig build targets
  riscv: mm: don't advertise 1 num_asid for 0 asid bits
  riscv: set default pm_power_off to NULL
  riscv/vdso: Add support for time namespaces
---

b89f311d7e25eb246376ac10de46d6ecc6b6ed5c
diff --cc arch/riscv/Kconfig
index a34c531be4e7,dcd7afcd98ef..821252b65f89
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -62,6 -62,8 +62,7 @@@ config RISC
  	select GENERIC_SCHED_CLOCK
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
+ 	select GENERIC_VDSO_TIME_NS if HAVE_GENERIC_VDSO
 -	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
  	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
  	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
diff --cc arch/riscv/Makefile
index 7f19b784e649,9247407b95d6..5927c94302b8
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -136,3 -137,16 +136,13 @@@ zinstall: install-image = Image.g
  install zinstall:
  	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
  	$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
+ 
 -archclean:
 -	$(Q)$(MAKE) $(clean)=$(boot)
 -
+ PHONY += rv32_randconfig
+ rv32_randconfig:
+ 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/32-bit.config \
+ 		-f $(srctree)/Makefile randconfig
+ 
+ PHONY += rv64_randconfig
+ rv64_randconfig:
+ 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/64-bit.config \
+ 		-f $(srctree)/Makefile randconfig