x86/asm/entry: Make thunk's restore a local label
authorBorislav Petkov <bp@suse.de>
Fri, 8 Jul 2016 14:01:48 +0000 (16:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 8 Jul 2016 14:47:01 +0000 (16:47 +0200)
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

index 027aec4..627ecbc 100644 (file)
@@ -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