diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/amd64/krtld/kobj_reloc.c | 13 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/fmsmb.c | 7 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c index 56c8087baa..401f13a33a 100644 --- a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c +++ b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * x86 relocation code. */ @@ -120,9 +118,8 @@ sdt_reloc_resolve(struct module *mp, char *symname, uint8_t *instr) } int -/* ARGSUSED2 */ -do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc, - int relocsize, Addr baseaddr) +do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, + Addr baseaddr) { unsigned long stndx; unsigned long off; /* can't be register for tnf_reloc_resolve() */ @@ -130,7 +127,7 @@ do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc, register unsigned int rtype; unsigned long value; Elf64_Sxword addend; - Sym *symref; + Sym *symref = NULL; int err = 0; tnf_probe_control_t *probelist = NULL; tnf_tag_data_t *taglist = NULL; @@ -326,8 +323,8 @@ do_relocations(struct module *mp) } #endif - if (do_relocate(mp, (char *)rshp->sh_addr, rshp->sh_type, - nreloc, rshp->sh_entsize, shp->sh_addr) < 0) { + if (do_relocate(mp, (char *)rshp->sh_addr, nreloc, + rshp->sh_entsize, shp->sh_addr) < 0) { _kobj_printf(ops, "do_relocations: %s do_relocate failed\n", mp->filename); diff --git a/usr/src/uts/intel/os/fmsmb.c b/usr/src/uts/intel/os/fmsmb.c index 3a4785475b..51ca9dd693 100644 --- a/usr/src/uts/intel/os/fmsmb.c +++ b/usr/src/uts/intel/os/fmsmb.c @@ -1073,7 +1073,8 @@ bad: } int -fm_smb_mc_chipinst(uint_t bdf, uint_t *chip_inst) { +fm_smb_mc_chipinst(uint_t bdf, uint_t *chip_inst) +{ int i, j; smbios_hdl_t *shp; @@ -1101,10 +1102,12 @@ fm_smb_mc_chipinst(uint_t bdf, uint_t *chip_inst) { mastypes->type = SUN_OEM_EXT_MEMARRAY; smb_strcnt(shp, mastypes); + pstypes = NULL; + p_strcnt = 0; for (i = 0; i < mastypes->count; i++) { ext_id = mastypes->ids[i]->id; (void) smbios_info_extmemarray(shp, ext_id, &em); - if (em.smbmae_bdf == bdf) { + if (em.smbmae_bdf == bdf) { p_strcnt = smb_cnttypes(shp, SMB_TYPE_PROCESSOR); if (p_strcnt == 0) { smb_free_strcnt(mastypes, ma_strcnt); |