Skip to contentSkip to conversation

x86/power/hibernate: Use local labels in asm

PATCH In review Borislav Petkov 4 participants 4 messages Apr 12, 2015 – Apr 15, 2015

Subsystems (2)
lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/power/hibernate: Use local labels in asm

From: Borislav Petkov <[email protected]>

... 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.

Cc "Rafael J. Wysocki" <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
---
 arch/x86/power/hibernate_asm_64.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/power/hibernate_asm_64.S +4 -4
index 3c4469a7a929..e2386cb4e0c3 100644
@@ -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
 	/*
Signature · 1 line
2.3.5
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

... 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.

Quoted 7 lines
Cc "Rafael J. Wysocki" <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Quoted 32 lines
---
 arch/x86/power/hibernate_asm_64.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/power/hibernate_asm_64.S +4 -4
index 3c4469a7a929..e2386cb4e0c3 100644
@@ -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
 	/*
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
Acked-by on v1 1/1
#2 lore raw
In reply to Borislav Petkov
Quoted 9 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

... 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.

Cc "Rafael J. Wysocki" <[email protected]>
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#3 lore raw

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

In reply to Borislav Petkov
x86/asm, x86/power/hibernate: Use local labels in asm
Commit-ID:  ff22e2010144b6aa050da35851f1fa79087cca06
Gitweb:     http://git.kernel.org/tip/ff22e2010144b6aa050da35851f1fa79087cca06
Author:     Borislav Petkov <[email protected]>
AuthorDate: Sun, 12 Apr 2015 21:45:06 +0200
Committer:  Ingo Molnar <[email protected]>
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.

---
 arch/x86/power/hibernate_asm_64.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/power/hibernate_asm_64.S +4 -4
index 3c4469a..e2386cb 100644
@@ -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
 	/*