summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2021-01-21 15:29:32 -0600
committerJosh Poimboeuf <jpoimboe@redhat.com>2021-01-26 11:33:03 -0600
commitf83d1a0190bf6ac788a848454d21daee2299d085 (patch)
tree748713bb3824671e14dd659da78c61f1a9e8f07d
parent7cae4b1cf1cc42f490422e20662169e8656c915a (diff)
downloadlinux-stable-f83d1a0190bf6ac788a848454d21daee2299d085.tar.gz
linux-stable-f83d1a0190bf6ac788a848454d21daee2299d085.tar.bz2
linux-stable-f83d1a0190bf6ac788a848454d21daee2299d085.zip
x86/acpi: Annotate indirect branch as safe
This indirect jump is harmless; annotate it to keep objtool's retpoline validation happy. Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lore.kernel.org/r/a7288e7043265d95c1a5d64f9fd751ead4854bdc.1611263462.git.jpoimboe@redhat.com
-rw-r--r--arch/x86/kernel/acpi/wakeup_64.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 5d3a0b8fd379..9c9c66662ada 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -7,6 +7,7 @@
#include <asm/msr.h>
#include <asm/asm-offsets.h>
#include <asm/frame.h>
+#include <asm/nospec-branch.h>
# Copyright 2003 Pavel Machek <pavel@suse.cz
@@ -39,6 +40,7 @@ SYM_FUNC_START(wakeup_long64)
movq saved_rbp, %rbp
movq saved_rip, %rax
+ ANNOTATE_RETPOLINE_SAFE
jmp *%rax
SYM_FUNC_END(wakeup_long64)