lkml.org 
[lkml]   [2012]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/74] x86, lto: Fix sys_call_table type in asm/syscall.h v2
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Make the sys_call_table type defined in asm/syscall.h match
    the definition in syscall_64.c

    v2: include asm/syscall.h in syscall_64.c too. I left uml alone
    because it doesn't have an syscall.h on its own and including
    the native one leads to other errors.
    Cc: x86@kernel.org
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    arch/x86/include/asm/syscall.h | 3 ++-
    arch/x86/kernel/syscall_64.c | 3 +--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
    index 1ace47b..c36962d 100644
    --- a/arch/x86/include/asm/syscall.h
    +++ b/arch/x86/include/asm/syscall.h
    @@ -20,7 +20,8 @@
    #include <asm/thread_info.h> /* for TS_COMPAT */
    #include <asm/unistd.h>

    -extern const unsigned long sys_call_table[];
    +typedef void (*sys_call_ptr_t)(void);
    +extern const sys_call_ptr_t sys_call_table[];

    /*
    * Only the low 32 bits of orig_ax are meaningful, so we return int.
    diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c
    index 3967318..4ac730b 100644
    --- a/arch/x86/kernel/syscall_64.c
    +++ b/arch/x86/kernel/syscall_64.c
    @@ -4,6 +4,7 @@
    #include <linux/sys.h>
    #include <linux/cache.h>
    #include <asm/asm-offsets.h>
    +#include <asm/syscall.h>

    #define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)

    @@ -19,8 +20,6 @@

    #define __SYSCALL_64(nr, sym, compat) [nr] = sym,

    -typedef void (*sys_call_ptr_t)(void);
    -
    extern void sys_ni_syscall(void);

    asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-19 06:01    [W:0.024 / U:30.712 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site