diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-29 12:41:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-29 12:41:18 +0000 |
| commit | 17296045b06634567568b1654a46c22c764d76e9 (patch) | |
| tree | a2454d2c17bc51a6a23f427d741d184ef332516a /usr/src/cmd | |
| parent | 0e23d370e331acbebe8ad55ddb59eb475b05405a (diff) | |
| parent | 229852ddf2d8636b0c8a6628c3e97fef2aadbcfd (diff) | |
| download | illumos-joyent-release-20180705.tar.gz | |
[illumos-gate merge]release-20180705
commit 229852ddf2d8636b0c8a6628c3e97fef2aadbcfd
9629 ksh93(1): Missing zero in z4cx
commit ea30102ce458697473b0435bcdc7647dce2551f4
9586 need to handle SP's that present multiple sensors with the same entity name
9587 Add test mechanism to sensor-transport module for spoofing sensor states
Conflicts:
usr/src/lib/fm/topo/libtopo/common/topo_method.c
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/fm/modules/common/sensor-transport/sensor_transport.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/fm/modules/common/sensor-transport/sensor_transport.c b/usr/src/cmd/fm/modules/common/sensor-transport/sensor_transport.c index db8715ac01..50383d4530 100644 --- a/usr/src/cmd/fm/modules/common/sensor-transport/sensor_transport.c +++ b/usr/src/cmd/fm/modules/common/sensor-transport/sensor_transport.c @@ -218,10 +218,10 @@ st_check_component(topo_hdl_t *thp, tnode_t *node, void *arg) /* * We add this FRU to our list under two circumstances: * - * 1. This FRU is faulted and needs to be remembered to + * 1. This FRU is faulted and needs to be remembered to * avoid duplicate ereports. * - * 2. This is the initial pass, and we want to repair the + * 2. This is the initial pass, and we want to repair the * FRU in case it was repaired while we were offline. */ if (stp->st_first || faulted) { @@ -435,7 +435,7 @@ static const fmd_prop_t fmd_props[] = { static const fmd_hdl_ops_t fmd_ops = { NULL, /* fmdo_recv */ st_timeout, /* fmdo_timeout */ - NULL, /* fmdo_close */ + NULL, /* fmdo_close */ NULL, /* fmdo_stats */ NULL, /* fmdo_gc */ NULL, /* fmdo_send */ |