summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNathan Lynch <ntl@pobox.com>2010-08-10 18:03:08 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:27:23 -0700
commite9d2a41cea95d1efb23b5803ec8d5e89a0986265 (patch)
treea11ec7ddc4a2c102f49b6d9d97a0bb0660c44830 /include
parent76599ef912a081977e84d5fbdb0917a0c1051768 (diff)
signalfd: fill in ssi_int for posix timers and message queues
commit a2a20c412c86e0bb46a9ab0dd31bcfe6d201b913 upstream. If signalfd is used to consume a signal generated by a POSIX interval timer or POSIX message queue, the ssi_int field does not reflect the data (sigevent->sigev_value) supplied to timer_create(2) or mq_notify(3). (The ssi_ptr field, however, is filled in.) This behavior differs from signalfd's treatment of sigqueue-generated signals -- see the default case in signalfd_copyinfo. It also gives results that differ from the case when a signal is handled conventionally via a sigaction-registered handler. So, set signalfd_siginfo->ssi_int in the remaining cases (__SI_TIMER, __SI_MESGQ) where ssi_ptr is set. akpm: a non-back-compatible change. Merge into -stable to minimise the number of kernels which are in the field and which miss this feature. Signed-off-by: Nathan Lynch <ntl@pobox.com> Acked-by: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions