projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cae4b1
)
x86/acpi: Annotate indirect branch as safe
author
Josh Poimboeuf
<jpoimboe@redhat.com>
Thu, 21 Jan 2021 21:29:32 +0000
(15:29 -0600)
committer
Josh Poimboeuf
<jpoimboe@redhat.com>
Tue, 26 Jan 2021 17:33:03 +0000
(11:33 -0600)
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
arch/x86/kernel/acpi/wakeup_64.S
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/acpi/wakeup_64.S
b/arch/x86/kernel/acpi/wakeup_64.S
index
5d3a0b8
..
9c9c666
100644
(file)
--- 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)