lkml.org 
[lkml]   [2016]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] MIPS: Fix siginfo.h to use strict posix types
    Date
    Commit 85efde6f4e0d ("make exported headers use strict posix types")
    changed the asm-generic siginfo.h to use the __kernel_* types, and
    commit 3a471cbc081b ("remove __KERNEL_STRICT_NAMES") make the internal
    types accessible only to the kernel, but the MIPS implementation hasn't
    been updated to match.

    Switch to proper types now so that the exported asm/siginfo.h won't
    produce quite so many compiler errors when included alone by a user
    program.

    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Cc: <stable@vger.kernel.org> # 2.6.30-
    ---
    arch/mips/include/uapi/asm/siginfo.h | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
    index 2cb7fdead570..03ec1090f781 100644
    --- a/arch/mips/include/uapi/asm/siginfo.h
    +++ b/arch/mips/include/uapi/asm/siginfo.h
    @@ -42,13 +42,13 @@ typedef struct siginfo {

    /* kill() */
    struct {
    - pid_t _pid; /* sender's pid */
    + __kernel_pid_t _pid; /* sender's pid */
    __ARCH_SI_UID_T _uid; /* sender's uid */
    } _kill;

    /* POSIX.1b timers */
    struct {
    - timer_t _tid; /* timer id */
    + __kernel_timer_t _tid; /* timer id */
    int _overrun; /* overrun count */
    char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
    sigval_t _sigval; /* same as below */
    @@ -57,26 +57,26 @@ typedef struct siginfo {

    /* POSIX.1b signals */
    struct {
    - pid_t _pid; /* sender's pid */
    + __kernel_pid_t _pid; /* sender's pid */
    __ARCH_SI_UID_T _uid; /* sender's uid */
    sigval_t _sigval;
    } _rt;

    /* SIGCHLD */
    struct {
    - pid_t _pid; /* which child */
    + __kernel_pid_t _pid; /* which child */
    __ARCH_SI_UID_T _uid; /* sender's uid */
    int _status; /* exit code */
    - clock_t _utime;
    - clock_t _stime;
    + __kernel_clock_t _utime;
    + __kernel_clock_t _stime;
    } _sigchld;

    /* IRIX SIGCHLD */
    struct {
    - pid_t _pid; /* which child */
    - clock_t _utime;
    + __kernel_pid_t _pid; /* which child */
    + __kernel_clock_t _utime;
    int _status; /* exit code */
    - clock_t _stime;
    + __kernel_clock_t _stime;
    } _irix_sigchld;

    /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
    --
    2.4.10
    \
     
     \ /
      Last update: 2016-02-08 20:01    [W:4.539 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site