From patchwork Wed Apr 15 06:50:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 6219021 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 ECB249F2EC for ; Wed, 15 Apr 2015 06:52:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B3F020379 for ; Wed, 15 Apr 2015 06:52:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D933520375 for ; Wed, 15 Apr 2015 06:52:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752054AbbDOGwg (ORCPT ); Wed, 15 Apr 2015 02:52:36 -0400 Received: from mail.skyhub.de ([78.46.96.112]:34203 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160AbbDOGwf (ORCPT ); Wed, 15 Apr 2015 02:52:35 -0400 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1429080754; bh=ZYyfpJ1wrIvHAwrVbDUtj1NwMBoSVycflnVlR74Q/0c=; h=From:To:Cc:Subject:Date:Message-Id; b=o8LSmZm0YjcH8n0wC1aSYf7LkH3 kzHuIrroIrmP2JTaw34pcrL2SJ74L2z6WaoHfi1J2GLXgnmeVVko8VVtXe4fIYP8IZf EGHov0r5xuF46Vm22nsXugmkv2ikQaGCF1V7ybb0rzLYQnm6JHDTXB75rYnwHjQrdl/ F64YV1cgKs= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zidUCzaMYE20; Wed, 15 Apr 2015 08:52:34 +0200 (CEST) Received: from pd.tnic (p5DDC47C7.dip0.t-ipconnect.de [93.220.71.199]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id BF0EB1D99AF; Wed, 15 Apr 2015 08:52:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1429080754; bh=ZYyfpJ1wrIvHAwrVbDUtj1NwMBoSVycflnVlR74Q/0c=; h=From:To:Cc:Subject:Date:Message-Id; b=o8LSmZm0YjcH8n0wC1aSYf7LkH3 kzHuIrroIrmP2JTaw34pcrL2SJ74L2z6WaoHfi1J2GLXgnmeVVko8VVtXe4fIYP8IZf EGHov0r5xuF46Vm22nsXugmkv2ikQaGCF1V7ybb0rzLYQnm6JHDTXB75rYnwHjQrdl/ F64YV1cgKs= Received: by pd.tnic (Postfix, from userid 1000) id 702011600C6; Wed, 15 Apr 2015 08:50:14 +0200 (CEST) From: Borislav Petkov To: "Rafael J. Wysocki" Cc: X86 ML , LKML , Len Brown , Pavel Machek , Subject: [PATCH] acpi/wakeup_64.S: Make global label a local one Date: Wed, 15 Apr 2015 08:50:14 +0200 Message-Id: <1429080614-22610-1-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 X-Virus-Scanned: ClamAV using ClamSMTP From: Borislav Petkov 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: --- before 2015-04-15 08:44:43.088036283 +0200 +++ after 2015-04-15 08:40:38.292028826 +0200 @@ -36,9 +36,7 @@ ffffffff81039dba: 48 83 c4 08 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: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: Cc: --- arch/x86/kernel/acpi/wakeup_64.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index ae693b51ed8e..8c35df468104 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