From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756376AbbDOPqh (ORCPT ); Wed, 15 Apr 2015 11:46:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57579 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776AbbDOPq3 (ORCPT ); Wed, 15 Apr 2015 11:46:29 -0400 Date: Wed, 15 Apr 2015 08:46:07 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: pavel@ucw.cz, rjw@rjwysocki.net, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, rafael.j.wysocki@intel.com, mingo@kernel.org, bp@suse.de Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@suse.de, rafael.j.wysocki@intel.com, pavel@ucw.cz, rjw@rjwysocki.net, tglx@linutronix.de In-Reply-To: <1428867906-12016-1-git-send-email-bp@alien8.de> References: <1428867906-12016-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm, x86/power/hibernate: Use local labels in asm Git-Commit-ID: ff22e2010144b6aa050da35851f1fa79087cca06 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ff22e2010144b6aa050da35851f1fa79087cca06 Gitweb: http://git.kernel.org/tip/ff22e2010144b6aa050da35851f1fa79087cca06 Author: Borislav Petkov AuthorDate: Sun, 12 Apr 2015 21:45:06 +0200 Committer: Ingo Molnar 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 Acked-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: H. Peter Anvin Cc: Rafael J. Wysocki Cc: Thomas Gleixner 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 --- 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 /*