[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-ff22e2010144b6aa050da35851f1fa79087cca06@git.kernel.org>
Date: Wed, 15 Apr 2015 08:46:07 -0700
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: pavel@....cz, rjw@...ysocki.net, tglx@...utronix.de,
linux-kernel@...r.kernel.org, hpa@...or.com,
rafael.j.wysocki@...el.com, mingo@...nel.org, bp@...e.de
Subject: [tip:x86/asm] x86/asm, x86/power/hibernate:
Use local labels in asm
Commit-ID: ff22e2010144b6aa050da35851f1fa79087cca06
Gitweb: http://git.kernel.org/tip/ff22e2010144b6aa050da35851f1fa79087cca06
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Sun, 12 Apr 2015 21:45:06 +0200
Committer: Ingo Molnar <mingo@...nel.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@...e.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Acked-by: Pavel Machek <pavel@....cz>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Rafael J. Wysocki <rjw@...ysocki.net>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-pm@...r.kernel.org
Link: http://lkml.kernel.org/r/1428867906-12016-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.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
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists