Commit b682369d authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

x86/power: Annotate indirect branches as safe 



These indirect jumps are harmless; annotate them to make objtool's
retpoline validation happy.

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/ba7a141c98f2c09c255b19bf78ee4a5f45d4ecb6.1611263462.git.jpoimboe@redhat.com
parent aeb818fc

arch/x86/power/hibernate_asm_64.S

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/asm-offsets.h>

#include <asm/processor-flags.h>

#include <asm/frame.h>

#include <asm/nospec-branch.h>



SYM_FUNC_START(swsusp_arch_suspend)

	movq	$saved_context, %rax
@@ -66,6 +67,7 @@ SYM_CODE_START(restore_image) 


	/* jump to relocated restore code */

	movq	relocated_restore_code(%rip), %rcx

	ANNOTATE_RETPOLINE_SAFE

	jmpq	*%rcx

SYM_CODE_END(restore_image)
@@ -97,6 +99,7 @@ SYM_CODE_START(core_restore_code) 


.Ldone:

	/* jump to the restore_registers address from the image header */

	ANNOTATE_RETPOLINE_SAFE

	jmpq	*%r8

SYM_CODE_END(core_restore_code)