* [PATCH] x86/power/hibernate: Use local labels in asm
@ 2015-04-12 19:45 Borislav Petkov
2015-04-12 23:06 ` Rafael J. Wysocki
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Borislav Petkov @ 2015-04-12 19:45 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: LKML, Pavel Machek, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-pm
From: Borislav Petkov <bp@suse.de>
... 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>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-pm@vger.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 3c4469a7a929..e2386cb4e0c3 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
/*
--
2.3.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] x86/power/hibernate: Use local labels in asm
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:x86/asm] x86/asm, " tip-bot for Borislav Petkov
2 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2015-04-12 23:06 UTC (permalink / raw)
To: Borislav Petkov
Cc: LKML, Pavel Machek, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-pm
On Sunday, April 12, 2015 09:45:06 PM Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... 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>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: linux-pm@vger.kernel.org
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 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 3c4469a7a929..e2386cb4e0c3 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
> /*
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/power/hibernate: Use local labels in asm
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:x86/asm] x86/asm, " tip-bot for Borislav Petkov
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Machek @ 2015-04-13 12:51 UTC (permalink / raw)
To: Borislav Petkov
Cc: Rafael J. Wysocki, LKML, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, linux-pm
On Sun 2015-04-12 21:45:06, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... 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>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/asm] x86/asm, x86/power/hibernate: Use local labels in asm
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
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Borislav Petkov @ 2015-04-15 15:46 UTC (permalink / raw)
To: linux-tip-commits
Cc: pavel, rjw, tglx, linux-kernel, hpa, rafael.j.wysocki, mingo, bp
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
/*
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-15 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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:x86/asm] x86/asm, " tip-bot for Borislav Petkov
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.