fix 4.14 build

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 631db2349d03cf48abb685c919acd5c2b8df3b97..3a38fad9bc2717c16823ab80f39e445c91092cfc 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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)