summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-01 16:04:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-01 16:04:27 -0700
commit3a99df9a3d14cd866b5516f8cba515a3bfd554ab (patch)
tree0bb1f9e9243f0d99e188a0b5f46c8ea09a6a7765
parent1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f (diff)
parentc3aff086ea11f17f5c0bec77bdbf4365ba6b41fc (diff)
downloadop-kernel-dev-3a99df9a3d14cd866b5516f8cba515a3bfd554ab.zip
op-kernel-dev-3a99df9a3d14cd866b5516f8cba515a3bfd554ab.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull signal bugfix from Eric Biederman: "When making the generic support for SIGEMT conditional on the presence of SIGEMT I made a typo that causes it to fail to activate. It was noticed comparatively quickly but the bug report just made it to me today" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signal: Fix name of SIGEMT in #if defined() check
-rw-r--r--kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 800a18f..8dcd882 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2698,7 +2698,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(SIGMET) && defined(NSIGEMT)
+#if defined(SIGEMT) && defined(NSIGEMT)
[SIGEMT] = { NSIGEMT, SIL_FAULT },
#endif
[SIGCHLD] = { NSIGCHLD, SIL_CHLD },
OpenPOWER on IntegriCloud