From: Sasha Levin Date: Wed, 24 Apr 2019 01:31:46 +0000 (-0400) Subject: fix 4.14 build X-Git-Tag: v3.18.139~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=234fffad2f9c17cbc70111682f3fa937ab0ce932;p=thirdparty%2Fkernel%2Fstable-queue.git fix 4.14 build Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/x86-speculation-prevent-deadlock-on-ssb_state-lock.patch b/queue-4.14/x86-speculation-prevent-deadlock-on-ssb_state-lock.patch index 631db2349d0..3a38fad9bc2 100644 --- a/queue-4.14/x86-speculation-prevent-deadlock-on-ssb_state-lock.patch +++ b/queue-4.14/x86-speculation-prevent-deadlock-on-ssb_state-lock.patch @@ -42,15 +42,6 @@ Signed-off-by: Greg Kroah-Hartman --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c -@@ -414,6 +414,8 @@ static __always_inline void __speculatio - u64 msr = x86_spec_ctrl_base; - bool updmsr = false; - -+ lockdep_assert_irqs_disabled(); -+ - /* - * If TIF_SSBD is different, select the proper mitigation - * method. Note that if SSBD mitigation is disabled or permanentely @@ -465,10 +467,12 @@ static unsigned long speculation_ctrl_up void speculation_ctrl_update(unsigned long tif)