diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-08-05 01:09:21 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-08-05 01:09:21 -0400 |
| commit | d491608f4e80ef223b7567c7914acbf733832708 (patch) | |
| tree | db3702c2a2ba0bfe6843d5fcaa0cc19f647e65d6 /usr/src/uts/intel/io/ipmi/ipmi_main.c | |
| parent | 7214807eae5f4cd01de736a5d1c72ef382fcb622 (diff) | |
| parent | 7105039931b43c4efeda411cd0527843723c90bd (diff) | |
| download | illumos-joyent-d491608f4e80ef223b7567c7914acbf733832708.tar.gz | |
[illumos-gate merge]
commit 7105039931b43c4efeda411cd0527843723c90bd
14887 audio_legacy_* prototypes can be removed
commit b75a8b718b0b6c50c43b47b15603947383771a04
14873 Retire ddi_getiminor()
commit 5b2c4190a831f52d91a5b92473ffb5a06e84511d
14812 pcie: properly set max packet size and tagging
commit bdb5139270356ff627abb9467f2b4fc8db3fb81d
14827 overlay_m_stop() blows verify in race with overlay_target_inject()
14853 overlay_setprop_vnetid bungles OVERLAY_F_MDDROP
commit 2c76d75129011c98e79463bb84917b828f922a11
13700 pollhead_delete trips over bad pointer
Conflicts:
manifest
usr/src/uts/common/sys/overlay_impl.h
usr/src/uts/common/syscall/poll.c
Diffstat (limited to 'usr/src/uts/intel/io/ipmi/ipmi_main.c')
| -rw-r--r-- | usr/src/uts/intel/io/ipmi/ipmi_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/uts/intel/io/ipmi/ipmi_main.c b/usr/src/uts/intel/io/ipmi/ipmi_main.c index e7671ce734..4c64a70a14 100644 --- a/usr/src/uts/intel/io/ipmi/ipmi_main.c +++ b/usr/src/uts/intel/io/ipmi/ipmi_main.c @@ -170,8 +170,6 @@ ipmi_open(dev_t *devp, int flag, int otyp, cred_t *cred) /* Initialize the per file descriptor data. */ dev = kmem_zalloc(sizeof (ipmi_device_t), KM_SLEEP); - dev->ipmi_pollhead = kmem_zalloc(sizeof (pollhead_t), KM_SLEEP); - TAILQ_INIT(&dev->ipmi_completed_requests); dev->ipmi_address = IPMI_BMC_SLAVE_ADDR; dev->ipmi_lun = IPMI_BMC_SMS_LUN; @@ -225,7 +223,7 @@ ipmi_close(dev_t dev, int flag, int otyp, cred_t *cred) mutex_exit(&dev_list_lock); id_free(minor_ids, getminor(dev)); cv_destroy(&dp->ipmi_cv); - kmem_free(dp->ipmi_pollhead, sizeof (pollhead_t)); + pollhead_clean(&dp->ipmi_pollhead); kmem_free(dp, sizeof (ipmi_device_t)); return (0); @@ -463,7 +461,7 @@ ipmi_poll(dev_t dv, short events, int anyyet, short *reventsp, } if ((revent == 0 && !anyyet) || (events & POLLET)) { - *phpp = dev->ipmi_pollhead; + *phpp = &dev->ipmi_pollhead; } *reventsp = revent; |