signal/sparc: Move EMT_TAGOVF into the generic siginfo.h

When moving all of the architectures specific si_codes into
siginfo.h, I apparently overlooked EMT_TAGOVF.  Move it now.

Remove the now redundant test in siginfo_layout for SIGEMT
as now NSIGEMT is always defined.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/arch/sparc/include/uapi/asm/siginfo.h b/arch/sparc/include/uapi/asm/siginfo.h
index e7049550ac823ab5c0ba17a47426dd3f312e0ed6..6c820ea0813bc7bc2d01b2fca9aa6b38e51f0697 100644 (file)
--- a/arch/sparc/include/uapi/asm/siginfo.h
+++ b/arch/sparc/include/uapi/asm/siginfo.h
@@ -17,10 +17,4 @@
 
 #define SI_NOINFO      32767           /* no information in siginfo_t */
 
-/*
- * SIGEMT si_codes
- */
-#define EMT_TAGOVF     1       /* tag overflow */
-#define NSIGEMT                1
-
 #endif /* _UAPI__SPARC_SIGINFO_H */

diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index 80e2a722720537e357479905122295cd1720c2f8..1811b8101937832e4c0c60ee219a3a808bfe88c3 100644 (file)
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -285,6 +285,12 @@ typedef struct siginfo {
 #define SYS_SECCOMP    1       /* seccomp triggered */
 #define NSIGSYS                1
 
+/*
+ * SIGEMT si_codes
+ */
+#define EMT_TAGOVF     1       /* tag overflow */
+#define NSIGEMT                1
+
 /*
  * sigevent definitions
  * 

diff --git a/kernel/signal.c b/kernel/signal.c
index e16278710b36e56c2598f14fe079b4fa24bbb11c..7b49c31d3fdb026415c95019a21aa2a3aff28aad 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2856,7 +2856,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
                        [SIGSEGV] = { NSIGSEGV, SIL_FAULT },
                        [SIGBUS]  = { NSIGBUS,  SIL_FAULT },
                        [SIGTRAP] = { NSIGTRAP, SIL_FAULT },
-#if defined(SIGEMT) && defined(NSIGEMT)
+#if defined(SIGEMT)
                        [SIGEMT]  = { NSIGEMT,  SIL_FAULT },
 #endif
                        [SIGCHLD] = { NSIGCHLD, SIL_CHLD },