From patchwork Sun Apr 12 19:45:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 6203941 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 C87C59F1AC for ; Sun, 12 Apr 2015 19:47:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB6E720251 for ; Sun, 12 Apr 2015 19:47:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7660F2021B for ; Sun, 12 Apr 2015 19:47:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751873AbbDLTrZ (ORCPT ); Sun, 12 Apr 2015 15:47:25 -0400 Received: from mail.skyhub.de ([78.46.96.112]:39652 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751862AbbDLTrY (ORCPT ); Sun, 12 Apr 2015 15:47:24 -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=1428868043; bh=xNSJPgVvGlBAmzNiMpWyfQmGsrEKIPx5nn1UbUrHboQ=; h=From:To:Cc:Subject:Date:Message-Id; b=K7O1FtOT3CoYob2MfXg2AuMysNc gmxNbjQMNkw4IqgBMA9wJGGr7qoWrryy/jrdEMpNoLny5vTlsjJAXRWWMDFqvRoaqQr SDvESiwpTlkdUJ2/0Thl62ZlpKKMPcVo0CBtAbQ6xTyAUsNYzsG9GKLfm0140glAKbu vXaR2Iur2c= 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 rFR22UwuV8is; Sun, 12 Apr 2015 21:47:22 +0200 (CEST) Received: from pd.tnic (p5DDC78D0.dip0.t-ipconnect.de [93.220.120.208]) (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 88E671D995C; Sun, 12 Apr 2015 21:47:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1428868042; bh=xNSJPgVvGlBAmzNiMpWyfQmGsrEKIPx5nn1UbUrHboQ=; h=From:To:Cc:Subject:Date:Message-Id; b=KojTX2sARWnY/ocV1teps8LUiE+ ocKrqONPbQDOXPtUBRQ2+6bB+5CdQm8xVoBeavjtlSpBzWVQUrqf2vxPY/IG6Ponxrx cXCKMk4ohUmt8Ae34K6n1l9tI8gWXqgkO9t0SHMpcnYP+dOkT9vUgs/t0/xJ712TC10 XDa+8+q81U= Received: by pd.tnic (Postfix, from userid 1000) id 84F0616110C; Sun, 12 Apr 2015 21:45:06 +0200 (CEST) From: Borislav Petkov To: "Rafael J. Wysocki" Cc: LKML , Pavel Machek , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-pm@vger.kernel.org Subject: [PATCH] x86/power/hibernate: Use local labels in asm Date: Sun, 12 Apr 2015 21:45:06 +0200 Message-Id: <1428867906-12016-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=ham 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 ... 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 Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: linux-pm@vger.kernel.org Acked-by: Rafael J. Wysocki Acked-by: Pavel Machek --- 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 /*