From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Feb 2020 13:12:19 +0000 (+0000)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v5.15~4548
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d60ddd244215da7c695cba858427094d8e366aa7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM updates from Russell King:

 - decompressor updates

 - prevention of out-of-bounds access while stacktracing

 - fix a section mismatch warning with free_memmap()

 - make kexec depend on MMU to avoid some build errors

 - remove swapops stubs

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8954/1: NOMMU: remove stubs for swapops
  ARM: 8952/1: Disable kmemleak on XIP kernels
  ARM: 8951/1: Fix Kexec compilation issue.
  ARM: 8949/1: mm: mark free_memmap as __init
  ARM: 8948/1: Prevent OOB access in stacktrace
  ARM: 8945/1: decompressor: use CONFIG option instead of cc-option
  ARM: 8942/1: Revert "8857/1: efi: enable CP15 DMB instructions before cleaning the cache"
  ARM: 8941/1: decompressor: enable CP15 barrier instructions in v7 cache setup code
---

d60ddd244215da7c695cba858427094d8e366aa7
diff --cc arch/arm/Kconfig
index 497e0e4,99a3e14..97864aa
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -72,9 -72,8 +72,9 @@@ config AR
  	select HAVE_ARM_SMCCC if CPU_V7
  	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32
  	select HAVE_CONTEXT_TRACKING
 +	select HAVE_COPY_THREAD_TLS
  	select HAVE_C_RECORDMCOUNT
- 	select HAVE_DEBUG_KMEMLEAK
+ 	select HAVE_DEBUG_KMEMLEAK if !XIP_KERNEL
  	select HAVE_DMA_CONTIGUOUS if MMU
  	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
  	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE