aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 10:08:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 10:08:50 -0800
commitfe1072ff7667e84be885fdbd9ef84c6e7c4f39ae (patch)
tree8746c92b296dd8a0028d0c89cb28f8df25fef520
parent5c2e7a0af211cb7a3a24fcfe98f0ceb67560b53b (diff)
parent4c7858b9001c85aacf86a74b3a68aa384bc33760 (diff)
downloadlinux-stericsson-fe1072ff7667e84be885fdbd9ef84c6e7c4f39ae.tar.gz
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
-rw-r--r--Makefile4
-rw-r--r--arch/parisc/Kconfig1
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6ecd0d22e608..f2dc2f953e23 100644
--- a/Makefile
+++ b/Makefile
@@ -1510,7 +1510,7 @@ endif # CONFIG_MODULES
# Directories & files removed with 'make clean'
CLEAN_FILES += include/ksym vmlinux.symvers \
modules.builtin modules.builtin.modinfo modules.nsdeps \
- compile_commands.json
+ compile_commands.json .thinlto-cache
# Directories & files removed with 'make mrproper'
MRPROPER_FILES += include/config include/generated \
@@ -1524,7 +1524,7 @@ MRPROPER_FILES += include/config include/generated \
*.spec
# Directories & files removed with 'make distclean'
-DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS .thinlto-cache
+DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
# clean - Delete most, but leave enough to build external modules
#
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 07fbe1a82f3e..4e53ac46e857 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -61,6 +61,7 @@ config PARISC
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