[tip:x86/asm] x86/asm, x86/power/hibernate: Use local labels in asm

From: tip-bot for Borislav Petkov
Date: Wed Apr 15 2015 - 11:46:39 EST

Commit-ID: ff22e2010144b6aa050da35851f1fa79087cca06
Gitweb: http://git.kernel.org/tip/ff22e2010144b6aa050da35851f1fa79087cca06
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Sun, 12 Apr 2015 21:45:06 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
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@xxxxxxx>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: linux-pm@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1428867906-12016-1-git-send-email-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
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 */
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
+ jmp .Lloop
/* 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/