releases/4.4.13/mips-fix-siginfo.h-to-use-strict-posix-types.patch

   1 From 5daebc477da4dfeb31ae193d83084def58fd2697 Mon Sep 17 00:00:00 2001
   2 From: James Hogan <james.hogan@imgtec.com>
   3 Date: Mon, 8 Feb 2016 18:43:49 +0000
   4 Subject: MIPS: Fix siginfo.h to use strict posix types
   5
   6 From: James Hogan <james.hogan@imgtec.com>
   7
   8 commit 5daebc477da4dfeb31ae193d83084def58fd2697 upstream.
   9
  10 Commit 85efde6f4e0d ("make exported headers use strict posix types")
  11 changed the asm-generic siginfo.h to use the __kernel_* types, and
  12 commit 3a471cbc081b ("remove __KERNEL_STRICT_NAMES") make the internal
  13 types accessible only to the kernel, but the MIPS implementation hasn't
  14 been updated to match.
  15
  16 Switch to proper types now so that the exported asm/siginfo.h won't
  17 produce quite so many compiler errors when included alone by a user
  18 program.
  19
  20 Signed-off-by: James Hogan <james.hogan@imgtec.com>
  21 Cc: Christopher Ferris <cferris@google.com>
  22 Cc: linux-mips@linux-mips.org
  23 Cc: linux-kernel@vger.kernel.org
  24 Patchwork: https://patchwork.linux-mips.org/patch/12477/
  25 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27
  28 ---
  29  arch/mips/include/uapi/asm/siginfo.h |   18 +++++++++---------
  30  1 file changed, 9 insertions(+), 9 deletions(-)
  31
  32 --- a/arch/mips/include/uapi/asm/siginfo.h
  33 +++ b/arch/mips/include/uapi/asm/siginfo.h
  34 @@ -42,13 +42,13 @@ typedef struct siginfo {
  35
  36                 /* kill() */
  37                 struct {
  38 -                       pid_t _pid;             /* sender's pid */
  39 +                       __kernel_pid_t _pid;    /* sender's pid */
  40                         __ARCH_SI_UID_T _uid;   /* sender's uid */
  41                 } _kill;
  42
  43                 /* POSIX.1b timers */
  44                 struct {
  45 -                       timer_t _tid;           /* timer id */
  46 +                       __kernel_timer_t _tid;  /* timer id */
  47                         int _overrun;           /* overrun count */
  48                         char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
  49                         sigval_t _sigval;       /* same as below */
  50 @@ -57,26 +57,26 @@ typedef struct siginfo {
  51
  52                 /* POSIX.1b signals */
  53                 struct {
  54 -                       pid_t _pid;             /* sender's pid */
  55 +                       __kernel_pid_t _pid;    /* sender's pid */
  56                         __ARCH_SI_UID_T _uid;   /* sender's uid */
  57                         sigval_t _sigval;
  58                 } _rt;
  59
  60                 /* SIGCHLD */
  61                 struct {
  62 -                       pid_t _pid;             /* which child */
  63 +                       __kernel_pid_t _pid;    /* which child */
  64                         __ARCH_SI_UID_T _uid;   /* sender's uid */
  65                         int _status;            /* exit code */
  66 -                       clock_t _utime;
  67 -                       clock_t _stime;
  68 +                       __kernel_clock_t _utime;
  69 +                       __kernel_clock_t _stime;
  70                 } _sigchld;
  71
  72                 /* IRIX SIGCHLD */
  73                 struct {
  74 -                       pid_t _pid;             /* which child */
  75 -                       clock_t _utime;
  76 +                       __kernel_pid_t _pid;    /* which child */
  77 +                       __kernel_clock_t _utime;
  78                         int _status;            /* exit code */
  79 -                       clock_t _stime;
  80 +                       __kernel_clock_t _stime;
  81                 } _irix_sigchld;
  82
  83                 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */