From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Oct 2018 23:20:28 +0000 (-0700)
Subject: Merge tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.20-rc1~42
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/3dca04d694f16cc74dc87de9a13547e2ffec81d7?hp=-c

Merge tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull more RISC-V updates from Palmer Dabbelt:
 "This contains the follow-on patches I'd like to target for the 4.20
  merge window. I'm being somewhat conservative here, as while there are
  a few patches on the mailing list that were posted early in the merge
  window I'd like to let those bake for another round -- this was a
  fairly big release as far as RISC-V is concerened, and we need to walk
  before we can run.

  As far as the patches that made it go:

   - A patch to ignore offline CPUs when calculating AT_HWCAP. This
     should fix GDB on the HiFive unleashed, which has an embedded core
     for hart 0 which is exposed to Linux as an offline CPU.

   - A move of EM_RISCV to elf-em.h, which is where it should have been
     to begin with.

   - I've also removed the 64-bit divide routines. I know I'm not really
     playing by my own rules here because I posted the patches this
     morning, but since they shouldn't be in the kernel I think it's
     better to err on the side of going too fast here.

  I don't anticipate any more patch sets for the merge window"

* tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  Move EM_RISCV into elf-em.h
  RISC-V: properly determine hardware caps
  Revert "lib: Add umoddi3 and udivmoddi4 of GCC library routines"
  Revert "RISC-V: Select GENERIC_LIB_UMODDI3 on RV32"
---

3dca04d694f16cc74dc87de9a13547e2ffec81d7
diff --combined arch/riscv/Kconfig
index d86842c21710,4198759f6798..55da93f4e818
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -28,12 -28,14 +28,12 @@@ config RISC
  	select GENERIC_STRNLEN_USER
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
 -	select HAVE_MEMBLOCK
  	select HAVE_MEMBLOCK_NODE_MAP
  	select HAVE_DMA_CONTIGUOUS
  	select HAVE_FUTEX_CMPXCHG if FUTEX
  	select HAVE_GENERIC_DMA_COHERENT
  	select HAVE_PERF_EVENTS
  	select IRQ_DOMAIN
 -	select NO_BOOTMEM
  	select RISCV_ISA_A if SMP
  	select SPARSE_IRQ
  	select SYSCTL_EXCEPTION_TRACE
@@@ -107,7 -109,6 +107,6 @@@ config ARCH_RV32
  	select GENERIC_LIB_ASHRDI3
  	select GENERIC_LIB_LSHRDI3
  	select GENERIC_LIB_UCMPDI2
- 	select GENERIC_LIB_UMODDI3
  
  config ARCH_RV64I
  	bool "RV64I"
diff --combined lib/Kconfig
index d1573a16aa92,a3928d4438b5..a9965f4af4dd
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -399,11 -399,8 +399,11 @@@ config INTERVAL_TRE
  
  	  for more information.
  
 -config RADIX_TREE_MULTIORDER
 +config XARRAY_MULTI
  	bool
 +	help
 +	  Support entries which occupy multiple consecutive indices in the
 +	  XArray.
  
  config ASSOCIATIVE_ARRAY
  	bool
@@@ -624,6 -621,3 +624,3 @@@ config GENERIC_LIB_CMPDI
  
  config GENERIC_LIB_UCMPDI2
  	bool
- 
- config GENERIC_LIB_UMODDI3
- 	bool
diff --combined lib/Makefile
index 988949c4fd3a,423876446810..db06d1237898
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -18,13 -18,13 +18,13 @@@ KCOV_INSTRUMENT_debugobjects.o := 
  KCOV_INSTRUMENT_dynamic_debug.o := n
  
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
 -	 rbtree.o radix-tree.o timerqueue.o\
 +	 rbtree.o radix-tree.o timerqueue.o xarray.o \
  	 idr.o int_sqrt.o extable.o \
  	 sha1.o chacha20.o irq_regs.o argv_split.o \
  	 flex_proportions.o ratelimit.o show_mem.o \
  	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
  	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
 -	 nmi_backtrace.o nodemask.o win_minmax.o
 +	 nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o
  
  lib-$(CONFIG_PRINTK) += dump_stack.o
  lib-$(CONFIG_MMU) += ioremap.o
@@@ -53,9 -53,7 +53,9 @@@ obj-$(CONFIG_TEST_HASH) += test_hash.o 
  obj-$(CONFIG_TEST_IDA) += test_ida.o
  obj-$(CONFIG_TEST_KASAN) += test_kasan.o
  CFLAGS_test_kasan.o += -fno-builtin
 +CFLAGS_test_kasan.o += $(call cc-disable-warning, vla)
  obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o
 +CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla)
  UBSAN_SANITIZE_test_ubsan.o := y
  obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
  obj-$(CONFIG_TEST_LIST_SORT) += test_list_sort.o
@@@ -70,11 -68,9 +70,11 @@@ obj-$(CONFIG_TEST_PRINTF) += test_print
  obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
  obj-$(CONFIG_TEST_BITFIELD) += test_bitfield.o
  obj-$(CONFIG_TEST_UUID) += test_uuid.o
 +obj-$(CONFIG_TEST_XARRAY) += test_xarray.o
  obj-$(CONFIG_TEST_PARMAN) += test_parman.o
  obj-$(CONFIG_TEST_KMOD) += test_kmod.o
  obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += test_debug_virtual.o
 +obj-$(CONFIG_TEST_MEMCAT_P) += test_memcat_p.o
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG
@@@ -274,4 -270,3 +274,3 @@@ obj-$(CONFIG_GENERIC_LIB_LSHRDI3) += ls
  obj-$(CONFIG_GENERIC_LIB_MULDI3) += muldi3.o
  obj-$(CONFIG_GENERIC_LIB_CMPDI2) += cmpdi2.o
  obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.o
- obj-$(CONFIG_GENERIC_LIB_UMODDI3) += umoddi3.o udivmoddi4.o