public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/asm/entry: Make thunk's restore a local label
@ 2016-06-23 11:49 Borislav Petkov
  2016-07-08 13:38 ` Ingo Molnar
  0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2016-06-23 11:49 UTC (permalink / raw)
  To: X86 ML; +Cc: LKML

From: Borislav Petkov <bp@suse.de>

No need to have it appear in objdump output.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 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 027aec4a74df..7b506f52a92c 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  .Lrestore
 	_ASM_NOKPROBE(\name)
 	.endm
 
@@ -54,7 +54,7 @@
 #if defined(CONFIG_TRACE_IRQFLAGS) \
  || defined(CONFIG_DEBUG_LOCK_ALLOC) \
  || defined(CONFIG_PREEMPT)
-restore:
+.Lrestore:
 	popq %r11
 	popq %r10
 	popq %r9
@@ -66,5 +66,5 @@ restore:
 	popq %rdi
 	popq %rbp
 	ret
-	_ASM_NOKPROBE(restore)
+	_ASM_NOKPROBE(.Lrestore)
 #endif
-- 
2.5.0.rc2.28.g6003e7f

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] x86/asm/entry: Make thunk's restore a local label
  2016-06-23 11:49 [PATCH] x86/asm/entry: Make thunk's restore a local label Borislav Petkov
@ 2016-07-08 13:38 ` Ingo Molnar
  2016-07-08 14:10   ` [PATCH v1.1] " Borislav Petkov
  0 siblings, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2016-07-08 13:38 UTC (permalink / raw)
  To: Borislav Petkov; +Cc: X86 ML, LKML


* Borislav Petkov <bp@alien8.de> wrote:

> From: Borislav Petkov <bp@suse.de>
> 
> No need to have it appear in objdump output.
> 
> No functionality change.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>  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 027aec4a74df..7b506f52a92c 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  .Lrestore

Btw., could we make it .L_restore to make it more readable - or does the 
underscore confuse tooling?

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v1.1] x86/asm/entry: Make thunk's restore a local label
  2016-07-08 13:38 ` Ingo Molnar
@ 2016-07-08 14:10   ` Borislav Petkov
  2016-07-08 14:48     ` [tip:x86/asm] " tip-bot for Borislav Petkov
  0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2016-07-08 14:10 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

On Fri, Jul 08, 2016 at 03:38:51PM +0200, Ingo Molnar wrote:
> Btw., could we make it .L_restore to make it more readable - or does the 
> underscore confuse tooling?

Nah, builds fine too.

---
From: Borislav Petkov <bp@suse.de>
Date: Fri, 8 Jul 2016 16:01:48 +0200
Subject: [PATCH v1.1] 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>
---
 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 027aec4a74df..627ecbcb2e62 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
-- 
2.7.3

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [tip:x86/asm] x86/asm/entry: Make thunk's restore a local label
  2016-07-08 14:10   ` [PATCH v1.1] " Borislav Petkov
@ 2016-07-08 14:48     ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-07-08 14:48 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: mingo, torvalds, bp, bp, brgerst, dvlasenk, jpoimboe, peterz,
	luto, linux-kernel, tglx, hpa

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-07-08 14:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-23 11:49 [PATCH] x86/asm/entry: Make thunk's restore a local label Borislav Petkov
2016-07-08 13:38 ` Ingo Molnar
2016-07-08 14:10   ` [PATCH v1.1] " Borislav Petkov
2016-07-08 14:48     ` [tip:x86/asm] " tip-bot for Borislav Petkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox