Revert "UBUNTU: SAUCE: early/late -- annotate indirect calls in early/late initialisation code"

BugLink: https://bugs.launchpad.net/bugs/2046440

Not needed anymore with the change to make objtool warnings as fatal
errors for RETPOLINE and SLS.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

arch/x86/kernel/acpi/wakeup_32.S

@@ -3,7 +3,6 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
-#include <asm/nospec-branch.h>
 
 # Copyright 2003, 2008 Pavel Machek <pavel@suse.cz
 
@@ -38,7 +37,6 @@ SYM_CODE_START(wakeup_pmode_return)
 
 	# jump to place where we left off
 	movl	saved_eip, %eax
-	ANNOTATE_RETPOLINE_SAFE
 	jmp	*%eax
 SYM_CODE_END(wakeup_pmode_return)
 

arch/x86/kernel/head_32.S

@@ -27,7 +27,6 @@
 #include <asm/nospec-branch.h>
 #include <asm/bootparam.h>
 #include <asm/pgtable_32.h>
-#include <asm/nospec-branch.h>
 
 /* Physical address */
 #define pa(X) ((X) - __PAGE_OFFSET)

arch/x86/kernel/reboot.c

@@ -31,7 +31,6 @@
 #include <asm/realmode.h>
 #include <asm/x86_init.h>
 #include <asm/efi.h>
-#include <asm/nospec-branch.h>
 
 /*
  * Power off function, if any

arch/x86/kernel/relocate_kernel_32.S

@@ -9,7 +9,6 @@
 #include <asm/kexec.h>
 #include <asm/nospec-branch.h>
 #include <asm/processor-flags.h>
-#include <asm/nospec-branch.h>
 
 /*
  * Must be relocatable PIC code callable as a C function, in particular

arch/x86/realmode/rm/trampoline_32.S

@@ -23,7 +23,6 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
-#include <asm/nospec-branch.h>
 #include "realmode.h"
 
 	.text
@@ -60,7 +59,6 @@ SYM_CODE_END(trampoline_start)
 	.section ".text32","ax"
 	.code32
 SYM_CODE_START(startup_32)			# note: also used from wakeup_asm.S
-	ANNOTATE_RETPOLINE_SAFE
 	jmp	*%eax
 SYM_CODE_END(startup_32)