Mercurial > illumos > git > illumos-gate
changeset 20208:365b3414b73b
13391 fm: build errors with gcc 7 on SPARC
Reviewed by: Yuri Pankov <yuripv@yuripv.dev>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Mon, 13 Apr 2020 18:58:09 +0300 |
| parents | 2de168d8ace1 |
| children | c107926bfcc5 |
| files | usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_Lxcacheerr.c usr/src/cmd/fm/modules/sun4v/etm/etm.c |
| diffstat | 2 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_Lxcacheerr.c Sun Dec 27 23:01:23 2020 +0200 +++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_Lxcacheerr.c Mon Apr 13 18:58:09 2020 +0300 @@ -377,10 +377,10 @@ static cmd_evdisp_t extract_data_from_ereport_payload(fmd_hdl_t *hdl, nvlist_t *nvl, - cmd_cpu_t *cpu, - cmd_ptrsubtype_t pstype, - uint64_t *afarp, uint64_t *tag_data, - const char *fltnm) + cmd_cpu_t *cpu, + cmd_ptrsubtype_t pstype, + uint64_t *afarp, uint64_t *tag_data, + const char *fltnm) { ch_ec_data_t *ec_data; char *payload_namep; @@ -472,19 +472,15 @@ static void gen_data_for_ecc(uint64_t *tag_data, uint64_t *data_for_ecc_gen, - cmd_ptrsubtype_t pstype) + cmd_ptrsubtype_t pstype) { uint64_t ptag[PN_CACHE_NWAYS]; uint8_t state[PN_CACHE_NWAYS]; int i; - uint16_t tag_ecc[PN_CACHE_NWAYS]; uint8_t bit_position; for (i = 0; i < PN_CACHE_NWAYS; i++) { state[i] = tag_data[i] & CH_ECSTATE_MASK; - tag_ecc[i] = - ((tag_data[i] & PN_TAG_ECC_MASK) - >> PN_LX_TAG_ECC_START_BIT); switch (pstype) { case CMD_PTR_CPU_L2TAG: ptag[i] = (tag_data[i] >> PN_L2_PTAG_SHIFT) & @@ -603,7 +599,7 @@ static cmd_Lxcache_t * cmd_create_and_destroy_Lxcache(fmd_hdl_t *hdl, cmd_cpu_t *cpu, - cmd_Lxcache_t *Lxcache) + cmd_Lxcache_t *Lxcache) { const char *fltnm; cmd_Lxcache_t *new_Lxcache; @@ -954,9 +950,9 @@ cmd_evdisp_t cmd_us4plus_tag_err(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, - cmd_cpu_t *cpu, cmd_ptrsubtype_t pstype, - const char *serdn, const char *serdt, - const char *fltnm, cmd_errcl_t clcode) + cmd_cpu_t *cpu, cmd_ptrsubtype_t pstype, + const char *serdn, const char *serdt, + const char *fltnm, cmd_errcl_t clcode) { uint64_t tag_afar; int32_t index; @@ -1576,7 +1572,7 @@ } /* add to cheetahregs.h */ -#define CH_ECSTATE_NA 5 +#define CH_ECSTATE_NA 5 static int32_t pn_extract_index(int32_t type, uint64_t afar) @@ -1611,7 +1607,7 @@ * If the way is anonomyous, it will attempt to choose a way for the * given index to fault. If the maximum for the index has not been * reached, it will attempt to unretire a different way previously retired - * under suspicion for the index prior to faulting + * under suspicion for the index prior to faulting * the selected way. * The routine will also fault the CPU if the maximum number of * retired ways for the CPU has been exceeded based on the category.
--- a/usr/src/cmd/fm/modules/sun4v/etm/etm.c Sun Dec 27 23:01:23 2020 +0200 +++ b/usr/src/cmd/fm/modules/sun4v/etm/etm.c Mon Apr 13 18:58:09 2020 +0300 @@ -3183,8 +3183,8 @@ "error: can't find iosvc " "for async evnt %d\n", async_e.event_type); - (void) pthread_mutex_unlock( - &iosvc_list_lock); + (void) pthread_mutex_unlock( + &iosvc_list_lock); break; } @@ -3197,7 +3197,7 @@ * the ldom name and the msg Q * remains in iosvc_list */ - if (iosvc->ldom_name != '\0') + if (*iosvc->ldom_name != '\0') fmd_hdl_debug(fmd_hdl, "info: iosvc w/ ldom_name " "%s \n", iosvc->ldom_name);