This patch replaces syscall_init by x86_64_syscall_init. The former will be later replaced by a paravirt replacement in case paravirt is on Signed-off-by: Glauber de Oliveira Costa <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> --- arch/x86_64/kernel/setup64.c | 8 +++++++- include/asm-x86_64/proto.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c index 49f7342..723822c 100644 --- a/arch/x86_64/kernel/setup64.c +++ b/arch/x86_64/kernel/setup64.c @@ -153,7 +153,7 @@ __attribute__((section(".bss.page_aligned"))); extern asmlinkage void ignore_sysret(void); /* May not be marked __init: used by software suspend */ -void syscall_init(void) +void x86_64_syscall_init(void) { /* * LSTAR and STAR live in a bit strange symbiosis. @@ -172,6 +172,12 @@ void syscall_init(void) wrmsrl(MSR_SYSCALL_MASK, EF_TF|EF_DF|EF_IE|0x3000); } +/* Overriden in paravirt.c if CONFIG_PARAVIRT */ +void __attribute__((weak)) syscall_init(void) +{ + x86_64_syscall_init(); +} + void __cpuinit check_efer(void) { unsigned long efer; diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 31f20ad..77ed2de 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -18,6 +18,9 @@ extern void init_memory_mapping(unsigned long start, unsigned long end); extern void system_call(void); extern int kernel_syscall(void); +#ifdef CONFIG_PARAVIRT +extern void x86_64_syscall_init(void); +#endif extern void syscall_init(void); extern void ia32_syscall(void); -- 1.4.4.2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 21/25] [PATCH] export cpu_gdt_descr
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 21/25] [PATCH] export cpu_gdt_descr
- References:
- Introducing paravirt_ops for x86_64
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 1/25] [PATCH] header file move
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 2/25] [PATCH] tlb flushing routines
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 3/25] [PATCH] irq_flags / halt routines
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 4/25] [PATCH] Add debugreg/load_rsp native hooks
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 5/25] [PATCH] native versions for system.h functions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 6/25] [PATCH] add native_apic read and write functions, as well as boot clocks ones
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 7/25] [PATCH] interrupt related native paravirt functions.
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 8/25] [PATCH] use macro for sti/cli in spinlock definitions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 9/25] [PATCH] report ring kernel is running without paravirt
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 10/25] [PATCH] export math_state_restore
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 11/25] [PATCH] introduce paravirt_release_pgd()
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 12/25] [PATCH] native versions for set pagetables
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 13/25] [PATCH] turn msr.h functions into native versions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 14/25] [PATCH] add native functions for descriptors handling
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 15/25] [PATCH] get rid of inline asm for load_cr3
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 16/25] [PATCH] introducing paravirt_activate_mm
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 17/25] [PATCH] turn page operations into native versions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 18/25] [PATCH] turn priviled operations into macros in entry.S
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 19/25] [PATCH] time-related functions paravirt provisions
- From: Glauber de Oliveira Costa <[email protected]>
- Introducing paravirt_ops for x86_64
- Prev by Date: [PATCH 19/25] [PATCH] time-related functions paravirt provisions
- Next by Date: [PATCH 18/25] [PATCH] turn priviled operations into macros in entry.S
- Previous by thread: [PATCH 19/25] [PATCH] time-related functions paravirt provisions
- Next by thread: [PATCH 21/25] [PATCH] export cpu_gdt_descr
- Index(es):
 |