Skip to content

Commit 5b115dc

Browse files
committed
Merge remote-tracking branches 'ras/edac-drivers', 'ras/edac-misc' and 'ras/edac-amd-atl' into edac-updates
* ras/edac-drivers: EDAC/r82600: Remove this obsolete driver EDAC/i82443bxgx: Remove driver that has been marked broken since 2007 EDAC/igen6: Add more Intel Panther Lake-H SoCs support EDAC/igen6: Make masks of {MCHBAR, TOM, TOUUD, ECC_ERROR_LOG} configurable EDAC/igen6: Add two Intel Amston Lake SoCs support EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size() EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size() * ras/edac-misc: EDAC/amd64: Avoid a -Wformat-security warning * ras/edac-amd-atl: RAS/AMD/ATL: Remove an unneeded semicolon Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
3 parents 1795dc5 + c816ba1 + 0923a61 commit 5b115dc

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/edac/amd64_edac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3911,7 +3911,7 @@ static int per_family_init(struct amd64_pvt *pvt)
39113911
}
39123912

39133913
if (tmp_name)
3914-
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name);
3914+
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "%s", tmp_name);
39153915
else
39163916
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh",
39173917
pvt->fam, pvt->model);

drivers/ras/amd/atl/denormalize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ static int denorm_addr_df4_np2(struct addr_ctx *ctx)
683683
default:
684684
atl_debug_on_bad_intlv_mode(ctx);
685685
return -EINVAL;
686-
};
686+
}
687687

688688
if (ctx->map.num_intlv_sockets == 1) {
689689
hash_pa8 = BIT_ULL(shift_value) & ctx->ret_addr;

0 commit comments

Comments
 (0)