summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/uapi/asm/siginfo.h
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2016-02-08 19:43:51 +0100
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 14:02:11 +0200
commit987e5b834467c9251ca584febda65ef8f66351a9 (patch)
tree0f432aa6e06c7f862002b55844f61eecaf0c4615 /arch/mips/include/uapi/asm/siginfo.h
parentSIGNAL: Move generic copy_siginfo() to signal.h (diff)
downloadlinux-987e5b834467c9251ca584febda65ef8f66351a9.tar.xz
linux-987e5b834467c9251ca584febda65ef8f66351a9.zip
MIPS: Fix uapi include in exported asm/siginfo.h
Since commit 8cb48fe169dd ("MIPS: Provide correct siginfo_t.si_stime"), MIPS' uapi/asm/siginfo.h has included uapi/asm-generic/siginfo.h directly before defining MIPS' struct siginfo, in order to get the necessary definitions needed for the siginfo struct without the generic copy_siginfo() hitting compiler errors due to struct siginfo not yet being defined. Now that the generic copy_siginfo() is moved out to linux/signal.h we can safely include asm-generic/siginfo.h before defining the MIPS specific struct siginfo, which avoids the uapi/ include as well as breakage due to generic copy_siginfo() being defined before struct siginfo. Reported-by: Christopher Ferris <cferris@google.com> Fixes: 8cb48fe169dd ("MIPS: Provide correct siginfo_t.si_stime") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Petr Malat <oss@malat.biz> Cc: linux-mips@linux-mips.org Cc: <stable@vger.kernel.org> # 4.0- Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/uapi/asm/siginfo.h')
-rw-r--r--arch/mips/include/uapi/asm/siginfo.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index 9db5bda8df3f..8069cf766603 100644
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -28,7 +28,7 @@
#define __ARCH_SIGSYS
-#include <uapi/asm-generic/siginfo.h>
+#include <asm-generic/siginfo.h>
/* We can't use generic siginfo_t, because our si_code and si_errno are swapped */
typedef struct siginfo {
@@ -123,6 +123,4 @@ typedef struct siginfo {
#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
-#include <asm-generic/siginfo.h>
-
#endif /* _UAPI_ASM_SIGINFO_H */