diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-17 11:08:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-17 11:08:29 -0700 |
| commit | 43567139f5f3808cda4f61c956576f8a4f2232cb (patch) | |
| tree | a878bdae763213bbde2d1deaab2c7a7f102d0d90 /arch/x86/kernel | |
| parent | 5a9ffb954a3933d7867f4341684a23e008d6839b (diff) | |
| parent | a9a3ed1eff3601b63aea4fb462d8b3b92c7c1e7e (diff) | |
| download | linux-43567139f5f3808cda4f61c956576f8a4f2232cb.tar.gz linux-43567139f5f3808cda4f61c956576f8a4f2232cb.tar.bz2 linux-43567139f5f3808cda4f61c956576f8a4f2232cb.zip | |
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 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 8c89e4d9ad28..2f24c334a938 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -266,6 +266,14 @@ static void notrace start_secondary(void *unused) wmb(); cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); + + /* + * Prevent tail call to cpu_startup_entry() because the stack protector + * guard has been changed a couple of function calls up, in + * boot_init_stack_canary() and must not be checked before tail calling + * another function. + */ + prevent_tail_call_optimization(); } /** |