From patchwork Wed Apr 15 15:46:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot for Kobe Wu X-Patchwork-Id: 6221771 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 055A79F1AC for ; Wed, 15 Apr 2015 15:47:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C0EB20274 for ; Wed, 15 Apr 2015 15:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13257201FA for ; Wed, 15 Apr 2015 15:47:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756407AbbDOPrD (ORCPT ); Wed, 15 Apr 2015 11:47:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57593 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756401AbbDOPq6 (ORCPT ); Wed, 15 Apr 2015 11:46:58 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.14.8/8.14.7) with ESMTP id t3FFkNhB027026; Wed, 15 Apr 2015 08:46:28 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.14.8/8.14.7/Submit) id t3FFkMxd027023; Wed, 15 Apr 2015 08:46:22 -0700 Date: Wed, 15 Apr 2015 08:46:22 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, len.brown@intel.com, rjw@rjwysocki.net, tglx@linutronix.de, torvalds@linux-foundation.org, bp@alien8.de, brgerst@gmail.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, bp@suse.de, pavel@ucw.cz, luto@amacapital.net, linux-pm@vger.kernel.org Reply-To: bp@suse.de, luto@amacapital.net, linux-pm@vger.kernel.org, pavel@ucw.cz, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, brgerst@gmail.com, hpa@zytor.com, len.brown@intel.com, mingo@kernel.org, rjw@rjwysocki.net In-Reply-To: <1429080614-22610-1-git-send-email-bp@alien8.de> References: <1429080614-22610-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm, x86/acpi/wakeup_64.S: Make global label a local one Git-Commit-ID: c0f6feba784e1087b905ad097d2d9ac0aaf744a5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit-ID: c0f6feba784e1087b905ad097d2d9ac0aaf744a5 Gitweb: http://git.kernel.org/tip/c0f6feba784e1087b905ad097d2d9ac0aaf744a5 Author: Borislav Petkov AuthorDate: Wed, 15 Apr 2015 08:50:14 +0200 Committer: Ingo Molnar CommitDate: Wed, 15 Apr 2015 11:38:01 +0200 x86/asm, x86/acpi/wakeup_64.S: Make global label a local one Make it a local symbol so that it doesn't appear in objdump output. No functionality change - code remains the same, just the global label disappears: ffffffff81039dbe: bf 03 00 00 00 mov $0x3,%edi ffffffff81039dc3: 31 c0 xor %eax,%eax ffffffff81039dc5: e8 b6 fd ff ff callq ffffffff81039b80 -ffffffff81039dca: eb 00 jmp ffffffff81039dcc - -ffffffff81039dcc : +ffffffff81039dca: eb 00 jmp ffffffff81039dcc ffffffff81039dcc: 48 c7 c0 80 1a ca 82 mov $0xffffffff82ca1a80,%rax ffffffff81039dd3: 48 8b 98 e2 00 00 00 mov 0xe2(%rax),%rbx ffffffff81039dda: 0f 22 e3 mov %rbx,%cr4 Signed-off-by: Borislav Petkov Cc: Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Pavel Machek Cc: Rafael J. Wysocki Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1429080614-22610-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/acpi/wakeup_64.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index ae693b5..8c35df4 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -62,7 +62,7 @@ ENTRY(do_suspend_lowlevel) pushfq popq pt_regs_flags(%rax) - movq $resume_point, saved_rip(%rip) + movq $.Lresume_point, saved_rip(%rip) movq %rsp, saved_rsp movq %rbp, saved_rbp @@ -75,10 +75,10 @@ ENTRY(do_suspend_lowlevel) xorl %eax, %eax call x86_acpi_enter_sleep_state /* in case something went wrong, restore the machine status and go on */ - jmp resume_point + jmp .Lresume_point .align 4 -resume_point: +.Lresume_point: /* We don't restore %rax, it must be 0 anyway */ movq $saved_context, %rax movq saved_context_cr4(%rax), %rbx