Patch "MIPS: Fix uapi include in exported asm/siginfo.h" has been added to the 4.5-stable tree

Patch "MIPS: Fix uapi include in exported asm/siginfo.h" has been added to the 4.5-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

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

to the 4.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mips-fix-uapi-include-in-exported-asm-siginfo.h.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 987e5b834467c9251ca584febda65ef8f66351a9 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Mon, 8 Feb 2016 18:43:51 +0000
Subject: MIPS: Fix uapi include in exported asm/siginfo.h

From: James Hogan <james.hogan@imgtec.com>

commit 987e5b834467c9251ca584febda65ef8f66351a9 upstream.

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
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 |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- 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 {
@@ -118,6 +118,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 */


Patches currently in stable-queue which might be from james.hogan@imgtec.com are

queue-4.5/mips64-r6-r2-emulation-bugfix.patch
queue-4.5/mips-fix-uapi-include-in-exported-asm-siginfo.h.patch
queue-4.5/mips-disable-preemption-during-prctl-pr_set_fp_mode.patch
queue-4.5/mips-fix-sigreturn-via-vdso-on-micromips-kernel.patch
queue-4.5/mips-fix-siginfo.h-to-use-strict-posix-types.patch
queue-4.5/mips-don-t-unwind-to-user-mode-with-eva.patch
queue-4.5/mips-vdso-build-with-fno-strict-aliasing.patch
queue-4.5/mips-fix-watchpoint-restoration.patch
queue-4.5/mips-build-micromips-vdso-for-micromips-kernels.patch
queue-4.5/mips-math-emu-fix-jalr-emulation-when-rd-0.patch
queue-4.5/mips-fix-msa-ld_-st_-asm-macros-to-use-ptr_addu.patch
queue-4.5/mips-avoid-using-unwind_stack-with-usermode.patch
queue-4.5/mips-prevent-restoration-of-msa-context-in-non-msa-kernels.patch
queue-4.5/mips-use-copy_s.fmt-rather-than-copy_u.fmt.patch