projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff22e20
)
x86/asm, x86/acpi/wakeup_64.S: Make global label a local one
author
Borislav Petkov
<bp@suse.de>
Wed, 15 Apr 2015 06:50:14 +0000
(08:50 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 15 Apr 2015 09:38:01 +0000
(11:38 +0200)
Make it a local symbol so that it doesn't appear in objdump
output.
No functionality change - code remains the same, just the global
label disappears:
ffffffff81039dbe
: bf 03 00 00 00 mov $0x3,%edi
ffffffff81039dc3
: 31 c0 xor %eax,%eax
ffffffff81039dc5
: e8 b6 fd ff ff callq
ffffffff81039b80
<x86_acpi_enter_sleep_state>
-
ffffffff81039dca
: eb 00 jmp
ffffffff81039dcc
<resume_point>
-
-
ffffffff81039dcc
<resume_point>:
+
ffffffff81039dca
: eb 00 jmp
ffffffff81039dcc
<do_suspend_lowlevel+0x9c>
ffffffff81039dcc
: 48 c7 c0 80 1a ca 82 mov $0xffffffff82ca1a80,%rax
ffffffff81039dd3
: 48 8b 98 e2 00 00 00 mov 0xe2(%rax),%rbx
ffffffff81039dda
: 0f 22 e3 mov %rbx,%cr4
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <linux-pm@vger.kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link:
http://lkml.kernel.org/r/1429080614-22610-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/acpi/wakeup_64.S
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/kernel/acpi/wakeup_64.S
b/arch/x86/kernel/acpi/wakeup_64.S
index ae693b51ed8ed589660570a77cfb5654af924388..8c35df4681041eee92f14020de8f795a8b7d710c 100644
(file)
--- a/
arch/x86/kernel/acpi/wakeup_64.S
+++ b/
arch/x86/kernel/acpi/wakeup_64.S
@@
-62,7
+62,7
@@
ENTRY(do_suspend_lowlevel)
pushfq
popq pt_regs_flags(%rax)
- movq $resume_point, saved_rip(%rip)
+ movq $
.L
resume_point, saved_rip(%rip)
movq %rsp, saved_rsp
movq %rbp, saved_rbp
@@
-75,10
+75,10
@@
ENTRY(do_suspend_lowlevel)
xorl %eax, %eax
call x86_acpi_enter_sleep_state
/* in case something went wrong, restore the machine status and go on */
- jmp resume_point
+ jmp
.L
resume_point
.align 4
-resume_point:
+
.L
resume_point:
/* We don't restore %rax, it must be 0 anyway */
movq $saved_context, %rax
movq saved_context_cr4(%rax), %rbx