Messages in this thread Patch in this message | | | From | Lai Jiangshan <> | Subject | [PATCH V6 11/49] x86/traps: Move the declaration of native_irq_return_iret into proto.h | Date | Fri, 26 Nov 2021 18:11:31 +0800 |
| |
From: Lai Jiangshan <laijs@linux.alibaba.com>
The declaration of native_irq_return_iret is used in exc_double_fault() only by now. But it will be used in other place later, so the declaration is moved to a header file for preparation.
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com> --- arch/x86/include/asm/proto.h | 1 + arch/x86/kernel/traps.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index feed36d44d04..33ae276c8b34 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -13,6 +13,7 @@ void syscall_init(void); #ifdef CONFIG_X86_64 void entry_SYSCALL_64(void); void entry_SYSCALL_64_safe_stack(void); +extern unsigned char native_irq_return_iret[]; long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2); #endif diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c9d566dcf89a..1be5c1edad6b 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -359,8 +359,6 @@ DEFINE_IDTENTRY_DF(exc_double_fault) #endif #ifdef CONFIG_X86_ESPFIX64 - extern unsigned char native_irq_return_iret[]; - /* * If IRET takes a non-IST fault on the espfix64 stack, then we * end up promoting it to a doublefault. In that case, take -- 2.19.1.6.gb485710b
| |