aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-28 13:37:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-28 13:37:41 -0700
commitf19e00ee84be14e840386cb4f3c0bda5b9cfb5ab (patch)
tree6881f4545023996284eb18004929a4ec147ba674 /arch
parent9c5efe9ae7df78600c0ee7bcce27516eb687fa6e (diff)
parentca14c996afe7228ff9b480cf225211cc17212688 (diff)
downloadlinux-f19e00ee84be14e840386cb4f3c0bda5b9cfb5ab.tar.gz
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar: "A kexec fix for the case when GCC_PLUGIN_STACKLEAK=y is enabled" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/purgatory: Disable the stackleak GCC plugin for the purgatory
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/purgatory/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index 527749066d31..fb4ee5444379 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -25,6 +25,7 @@ KCOV_INSTRUMENT := n
PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel
PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss
+PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN)
# Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
# in turn leaves some undefined symbols like __fentry__ in purgatory and not