[tip:x86/asm] x86/asm/entry: Make thunk's restore a local label

Path	csiph.com!news.mixmin.net!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	tip-bot for Borislav Petkov <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:x86/asm] x86/asm/entry: Make thunk's restore a local label
Date	Fri, 08 Jul 2016 16:50:02 +0200
Message-ID	<rSFgm-64x-29@gated-at.bofh.it> (permalink)
References	<rSENj-5T8-1@gated-at.bofh.it>
X-Original-To	linux-tip-commits@vger.kernel.org
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
Git-Commit-ID	9a7e7b571826c4399aa639af4a670642d96d935c
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> 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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	58
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Fri, 8 Jul 2016 07:48:45 -0700
X-Original-Message-ID	<tip-9a7e7b571826c4399aa639af4a670642d96d935c@git.kernel.org>
X-Original-References	<20160708141016.GH3808@pd.tnic>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1439536

Show key headers only | View raw

Commit-ID:  9a7e7b571826c4399aa639af4a670642d96d935c
Gitweb:     http://git.kernel.org/tip/9a7e7b571826c4399aa639af4a670642d96d935c
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Fri, 8 Jul 2016 16:01:48 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
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 <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160708141016.GH3808@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [PATCH] x86/asm/entry: Make thunk's restore a local label Ingo Molnar <mingo@kernel.org> - 2016-07-08 15:40 +0200
  [PATCH v1.1] x86/asm/entry: Make thunk's restore a local label Borislav Petkov <bp@alien8.de> - 2016-07-08 16:20 +0200
    [tip:x86/asm] x86/asm/entry: Make thunk's restore a local label tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-07-08 16:50 +0200

csiph-web