From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 28 Jul 2019 20:22:40 +0000 (+0200)
Subject: Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
X-Git-Tag: v5.3-rc4~39^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a30bdd99f37352b188575b27924c407c6ddff9e;p=thirdparty%2Flinux.git

Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Pick up the spectre documentation so the Grand Schemozzle can be added.
---

7a30bdd99f37352b188575b27924c407c6ddff9e
diff --cc arch/x86/entry/entry_64.S
index b043c754d978f,3f5a978a02a7d..be9ca198c581a
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@@ -1292,20 -1299,9 +1309,11 @@@ ENTRY(error_entry
  	movq	%rax, %rsp			/* switch stack */
  	ENCODE_FRAME_POINTER
  	pushq	%r12
- 
- 	/*
- 	 * We need to tell lockdep that IRQs are off.  We can't do this until
- 	 * we fix gsbase, and we should do it before enter_from_user_mode
- 	 * (which can take locks).
- 	 */
- 	TRACE_IRQS_OFF
- 	CALL_enter_from_user_mode
  	ret
  
 +.Lerror_entry_done_lfence:
 +	FENCE_SWAPGS_KERNEL_ENTRY
  .Lerror_entry_done:
- 	TRACE_IRQS_OFF
  	ret
  
  	/*