| From 5daebc477da4dfeb31ae193d83084def58fd2697 Mon Sep 17 00:00:00 2001 |
| From: James Hogan <james.hogan@imgtec.com> |
| Date: Mon, 8 Feb 2016 18:43:49 +0000 |
| Subject: MIPS: Fix siginfo.h to use strict posix types |
| |
| From: James Hogan <james.hogan@imgtec.com> |
| |
| commit 5daebc477da4dfeb31ae193d83084def58fd2697 upstream. |
| |
| 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: Christopher Ferris <cferris@google.com> |
| Cc: linux-mips@linux-mips.org |
| Cc: linux-kernel@vger.kernel.org |
| Patchwork: https://patchwork.linux-mips.org/patch/12477/ |
| Signed-off-by: Ralf Baechle <ralf@linux-mips.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/mips/include/uapi/asm/siginfo.h | 18 +++++++++--------- |
| 1 file changed, 9 insertions(+), 9 deletions(-) |
| |
| --- 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 */ |