Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a99df9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1cc15701 c3aff086

kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },