summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys
diff options
context:
space:
mode:
authorPatrick Mooney <pmooney@pfmooney.com>2016-09-24 09:17:04 -0700
committerRobert Mustacchi <rm@joyent.com>2016-10-13 16:27:17 -0700
commitabf99a006172ea5aab2246bda23f9d6d935bf1ad (patch)
treea3ec233fb21154d310a12e8d84fe97b8dd82c974 /usr/src/uts/common/sys
parent7b1019a6d29ccb7999dc76cba3dde1c627e8e609 (diff)
downloadillumos-joyent-abf99a006172ea5aab2246bda23f9d6d935bf1ad.tar.gz
7420 signalfd deadlock on pollwakeup
7421 panic in signalfd Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Dan McDonald <danmcd@omniti.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r--usr/src/uts/common/sys/signalfd.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr/src/uts/common/sys/signalfd.h b/usr/src/uts/common/sys/signalfd.h
index 2661d5a05f..89d0647020 100644
--- a/usr/src/uts/common/sys/signalfd.h
+++ b/usr/src/uts/common/sys/signalfd.h
@@ -10,7 +10,7 @@
*/
/*
- * Copyright 2015 Joyent, Inc.
+ * Copyright 2016 Joyent, Inc.
*/
/*
@@ -75,13 +75,9 @@ extern int signalfd(int, const sigset_t *, int);
#define SIGNALFDMNRN_SIGNALFD 0
#define SIGNALFDMNRN_CLONE 1
-typedef struct sigfd_wake_list {
- list_node_t sigfd_wl_lst;
- void *sigfd_wl_state;
-} sigfd_wake_list_t;
-
/*
* This holds the proc_t state for a process which is using signalfd.
+ * Its presence and contents are protected by p_lock.
*/
typedef struct sigfd_proc_state {
void (*sigfd_pollwake_cb)(void *, int);