lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 09/10] x86: entry, annotate interrupt symbols properly
Date
* annotate local common_interrupt properly by SYM_FUNC_START_LOCAL,
given it already has SYM_FUNC_END later
* use SYM_FUNC_INNER_LABEL for native_iret as it is in the middle of
common_interrupt function
* use SYM_FUNC_INNER_LABEL for native_irq_return_iret instead of
explicit .globl and label

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <x86@kernel.org>
---
arch/x86/entry/entry_64.S | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 3e523f8d7e7f..ee1bc5ebc88f 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -512,7 +512,7 @@ SYM_FUNC_END(irq_entries_start)
* then jump to common_interrupt.
*/
.p2align CONFIG_X86_L1_CACHE_SHIFT
-common_interrupt:
+SYM_FUNC_START_LOCAL(common_interrupt)
ASM_CLAC
addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */
interrupt do_IRQ
@@ -565,7 +565,7 @@ restore_c_regs_and_iret:
REMOVE_PT_GPREGS_FROM_STACK 8
INTERRUPT_RETURN

-ENTRY(native_iret)
+SYM_FUNC_INNER_LABEL(native_iret)
/*
* Are we returning to a stack segment from the LDT? Note: in
* 64-bit mode SS:RSP on the exception stack is always valid.
@@ -575,8 +575,7 @@ ENTRY(native_iret)
jnz native_irq_return_ldt
#endif

-.global native_irq_return_iret
-native_irq_return_iret:
+SYM_FUNC_INNER_LABEL(native_irq_return_iret)
/*
* This may fault. Non-paranoid faults on return to userspace are
* handled by fixup_bad_iret. These include #SS, #GP, and #NP.
--
2.12.0
\
 
 \ /
  Last update: 2017-03-20 13:34    [W:0.160 / U:0.176 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site