From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Feb 2021 18:08:50 +0000 (-0800)
Subject: Merge tag 'clang-lto-v5.12-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: dma-mapping-5.13~104
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe1072ff7667e84be885fdbd9ef84c6e7c4f39ae;p=users%2Fhch%2Fdma-mapping.git

Merge tag 'clang-lto-v5.12-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull clang LTO fixes from Kees Cook:
 "This gets parisc building again and moves LTO artifact caching cleanup
  from the 'distclean' build target to 'clean'.

  Summary:

   - Fix parisc build for ftrace vs mcount (Sami Tolvanen)

   - Move .thinlto-cache remove to "clean" from "distclean" (Masahiro Yamada)"

* tag 'clang-lto-v5.12-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kbuild: Move .thinlto-cache removal to 'make clean'
  parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
---

fe1072ff7667e84be885fdbd9ef84c6e7c4f39ae
diff --cc arch/parisc/Kconfig
index 07fbe1a82f3e,0ebde059bd7e..4e53ac46e857
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -61,9 -61,9 +61,10 @@@ config PARIS
  	select HAVE_KRETPROBES
  	select HAVE_DYNAMIC_FTRACE if $(cc-option,-fpatchable-function-entry=1,1)
  	select HAVE_FTRACE_MCOUNT_RECORD if HAVE_DYNAMIC_FTRACE
+ 	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
  	select HAVE_KPROBES_ON_FTRACE
  	select HAVE_DYNAMIC_FTRACE_WITH_REGS
 +	select HAVE_SOFTIRQ_ON_OWN_STACK if IRQSTACKS
  	select SET_FS
  
  	help