From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755874AbcGHOtz (ORCPT ); Fri, 8 Jul 2016 10:49:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56136 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600AbcGHOtm (ORCPT ); Fri, 8 Jul 2016 10:49:42 -0400 Date: Fri, 8 Jul 2016 07:48:45 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: mingo@kernel.org, torvalds@linux-foundation.org, bp@suse.de, bp@alien8.de, brgerst@gmail.com, dvlasenk@redhat.com, jpoimboe@redhat.com, peterz@infradead.org, luto@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: jpoimboe@redhat.com, dvlasenk@redhat.com, peterz@infradead.org, luto@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, torvalds@linux-foundation.org, bp@suse.de, bp@alien8.de, brgerst@gmail.com In-Reply-To: <20160708141016.GH3808@pd.tnic> References: <20160708141016.GH3808@pd.tnic> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry: Make thunk's restore a local label Git-Commit-ID: 9a7e7b571826c4399aa639af4a670642d96d935c 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: 9a7e7b571826c4399aa639af4a670642d96d935c Gitweb: http://git.kernel.org/tip/9a7e7b571826c4399aa639af4a670642d96d935c Author: Borislav Petkov AuthorDate: Fri, 8 Jul 2016 16:01:48 +0200 Committer: Ingo Molnar CommitDate: Fri, 8 Jul 2016 16:47:01 +0200 x86/asm/entry: Make thunk's restore a local label No need to have it appear in objdump output. No functionality change. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160708141016.GH3808@pd.tnic Signed-off-by: Ingo Molnar --- arch/x86/entry/thunk_64.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index 027aec4..627ecbc 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -33,7 +33,7 @@ .endif call \func - jmp restore + jmp .L_restore _ASM_NOKPROBE(\name) .endm @@ -54,7 +54,7 @@ #if defined(CONFIG_TRACE_IRQFLAGS) \ || defined(CONFIG_DEBUG_LOCK_ALLOC) \ || defined(CONFIG_PREEMPT) -restore: +.L_restore: popq %r11 popq %r10 popq %r9 @@ -66,5 +66,5 @@ restore: popq %rdi popq %rbp ret - _ASM_NOKPROBE(restore) + _ASM_NOKPROBE(.L_restore) #endif