summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-05-17 21:08:29 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-05-17 21:08:29 +0300
commit43567139f5f3808cda4f61c956576f8a4f2232cb (patch)
treea878bdae763213bbde2d1deaab2c7a7f102d0d90 /include
parent5a9ffb954a3933d7867f4341684a23e008d6839b (diff)
parenta9a3ed1eff3601b63aea4fb462d8b3b92c7c1e7e (diff)
downloadlinux-43567139f5f3808cda4f61c956576f8a4f2232cb.tar.xz
Merge tag 'x86_urgent_for_v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Borislav Petkov: "A single fix for early boot crashes of kernels built with gcc10 and stack protector enabled" * tag 'x86_urgent_for_v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Fix early boot crash on gcc-10, third try
Diffstat (limited to 'include')
-rw-r--r--include/linux/compiler.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 034b0a644efc..448c91bf543b 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -356,4 +356,10 @@ static inline void *offset_to_ptr(const int *off)
/* &a[0] degrades to a pointer: a different type from an array */
#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
+/*
+ * This is needed in functions which generate the stack canary, see
+ * arch/x86/kernel/smpboot.c::start_secondary() for an example.
+ */
+#define prevent_tail_call_optimization() mb()
+
#endif /* __LINUX_COMPILER_H */