lkml.org 
[lkml]   [2007]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/25][V3] replace syscall_init
    Date
    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 <gcosta@redhat.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    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 majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-15 15:01    [W:0.025 / U:1.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site