lkml.org 
[lkml]   [2015]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/14] Use sys_ni.c instead of #ifdef to disable fork on CONFIG_NOMMU
    Date
    I think this change actually doesn't do anything: __NR_fork was still
    being defined either way, and on my machine fork() in <unistd.h> comes
    from libc.

    This just moves to the standard mechanism for defining syscalls that
    aren't implemented instead, which has the side-effect of no longer
    having an #ifdef CONFIG_* in a user-visible header.

    Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
    Reviewed-by: Andrew Waterman <waterman@eecs.berkeley.edu>
    Reviewed-by: Albert Ou <aou@eecs.berkeley.edu>
    ---
    include/uapi/asm-generic/unistd.h | 4 ----
    kernel/sys_ni.c | 1 +
    2 files changed, 1 insertion(+), 4 deletions(-)

    diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
    index 1324b02..9a95912 100644
    --- a/include/uapi/asm-generic/unistd.h
    +++ b/include/uapi/asm-generic/unistd.h
    @@ -871,11 +871,7 @@ __SYSCALL(__NR_uselib, sys_uselib)
    __SYSCALL(__NR__sysctl, sys_sysctl)

    #define __NR_fork 1079
    -#ifdef CONFIG_MMU
    __SYSCALL(__NR_fork, sys_fork)
    -#else
    -__SYSCALL(__NR_fork, sys_ni_syscall)
    -#endif /* CONFIG_MMU */

    #undef __NR_syscalls
    #define __NR_syscalls (__NR_fork+1)
    diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
    index 0623787..e251b30 100644
    --- a/kernel/sys_ni.c
    +++ b/kernel/sys_ni.c
    @@ -174,6 +174,7 @@ cond_syscall(sys_setfsuid);
    cond_syscall(sys_setfsgid);
    cond_syscall(sys_capget);
    cond_syscall(sys_capset);
    +cond_syscall(sys_fork);

    /* arch-specific weak syscall entries */
    cond_syscall(sys_pciconfig_read);
    --
    2.4.10


    \
     
     \ /
      Last update: 2015-11-10 02:41    [W:4.379 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site