lkml.org 
[lkml]   [2011]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the namespace tree with Linus' tree
    Hi Eric,

    Today's linux-next merge of the namespace tree got a conflict in
    arch/alpha/include/asm/unistd.h arch/alpha/kernel/systbls.S between
    commit 90b57f35164a ("alpha: Wire up syscalls new to 2.6.39") from Linus'
    tree and commit e975ee91dcc1 ("ns: Wire up the setns system call") from
    the namespace tree.

    I fixed it up (see below) and can carry the fix as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc arch/alpha/include/asm/unistd.h
    index b183416,664383d..0000000
    --- a/arch/alpha/include/asm/unistd.h
    +++ b/arch/alpha/include/asm/unistd.h
    @@@ -452,14 -452,11 +452,15 @@@
    #define __NR_fanotify_init 494
    #define __NR_fanotify_mark 495
    #define __NR_prlimit64 496
    -#define __NR_setns 497
    +#define __NR_name_to_handle_at 497
    +#define __NR_open_by_handle_at 498
    +#define __NR_clock_adjtime 499
    +#define __NR_syncfs 500
    ++#define __NR_setns 501

    #ifdef __KERNEL__

    - #define NR_SYSCALLS 501
    -#define NR_SYSCALLS 498
    ++#define NR_SYSCALLS 502

    #define __ARCH_WANT_IPC_PARSE_VERSION
    #define __ARCH_WANT_OLD_READDIR
    diff --cc arch/alpha/kernel/systbls.S
    index 15f999d,4663fd5..0000000
    --- a/arch/alpha/kernel/systbls.S
    +++ b/arch/alpha/kernel/systbls.S
    @@@ -513,12 -513,9 +513,13 @@@ sys_call_table
    .quad sys_rt_tgsigqueueinfo
    .quad sys_perf_event_open
    .quad sys_fanotify_init
    - .quad sys_fanotify_mark /* 495 */
    + .quad sys_fanotify_mark /* 495 */
    .quad sys_prlimit64
    + .quad sys_name_to_handle_at
    + .quad sys_open_by_handle_at
    + .quad sys_clock_adjtime
    + .quad sys_syncfs /* 500 */
    + .quad sys_setns

    .size sys_call_table, . - sys_call_table
    .type sys_call_table, @object


    \
     
     \ /
      Last update: 2011-05-16 05:49    [W:0.020 / U:31.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site