| Message ID | 1428867906-12016-1-git-send-email-bp@alien8.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
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 > /* >
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>
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 /*