Commit d59a1b85 authored by James Hogan's avatar James Hogan Committed by Greg Kroah-Hartman

MIPS: Fix uapi include in exported asm/siginfo.h

commit 987e5b83 upstream.

Since commit 8cb48fe1 ("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: default avatarChristopher Ferris <cferris@google.com>
Fixes: 8cb48fe1 ("MIPS: Provide correct siginfo_t.si_stime")
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Petr Malat <oss@malat.biz>
Cc: linux-mips@linux-mips.org
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df27ff86
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define __ARCH_SIGSYS #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 */ /* We can't use generic siginfo_t, because our si_code and si_errno are swapped */
typedef struct siginfo { typedef struct siginfo {
...@@ -118,6 +118,4 @@ typedef struct siginfo { ...@@ -118,6 +118,4 @@ typedef struct siginfo {
#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */ #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 */ #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 */ #endif /* _UAPI_ASM_SIGINFO_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment