From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: pavel@ucw.cz, rjw@rjwysocki.net, tglx@linutronix.de,
linux-kernel@vger.kernel.org, hpa@zytor.com,
rafael.j.wysocki@intel.com, mingo@kernel.org, bp@suse.de
Subject: [tip:x86/asm] x86/asm, x86/power/hibernate: Use local labels in asm
Date: Wed, 15 Apr 2015 08:46:07 -0700 [thread overview]
Message-ID: <tip-ff22e2010144b6aa050da35851f1fa79087cca06@git.kernel.org> (raw)
In-Reply-To: <1428867906-12016-1-git-send-email-bp@alien8.de>
Commit-ID: ff22e2010144b6aa050da35851f1fa79087cca06
Gitweb: http://git.kernel.org/tip/ff22e2010144b6aa050da35851f1fa79087cca06
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Sun, 12 Apr 2015 21:45:06 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 15 Apr 2015 11:37:51 +0200
x86/asm, x86/power/hibernate: Use local labels in asm
... so that they don't appear in the object file and thus in
objdump output. They're local anyway and have a meaning only
within that file.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-pm@vger.kernel.org
Link: http://lkml.kernel.org/r/1428867906-12016-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/power/hibernate_asm_64.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S
index 3c4469a..e2386cb 100644
--- a/arch/x86/power/hibernate_asm_64.S
+++ b/arch/x86/power/hibernate_asm_64.S
@@ -78,9 +78,9 @@ ENTRY(restore_image)
/* code below has been relocated to a safe page */
ENTRY(core_restore_code)
-loop:
+.Lloop:
testq %rdx, %rdx
- jz done
+ jz .Ldone
/* get addresses from the pbe and copy the page */
movq pbe_address(%rdx), %rsi
@@ -91,8 +91,8 @@ loop:
/* progress to the next pbe */
movq pbe_next(%rdx), %rdx
- jmp loop
-done:
+ jmp .Lloop
+.Ldone:
/* jump to the restore_registers address from the image header */
jmpq *%rax
/*
prev parent reply other threads:[~2015-04-15 15:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-12 19:45 [PATCH] x86/power/hibernate: Use local labels in asm Borislav Petkov
2015-04-12 23:06 ` Rafael J. Wysocki
2015-04-13 12:51 ` Pavel Machek
2015-04-15 15:46 ` tip-bot for Borislav Petkov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ff22e2010144b6aa050da35851f1fa79087cca06@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pavel@ucw.cz \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.