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
This commit is contained in:
commit
3a99df9a3d
|
@ -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 },
|
||||
|
|
Loading…
Reference in New Issue