Skip to content

Commit 368736d

Browse files
committed
Merge remote-tracking branches 'ras/edac-drivers' and 'ras/edac-misc' into edac-updates
* ras/edac-drivers: EDAC/cell: Remove powerpc Cell driver EDAC: Add an EDAC driver for the Loongson memory controller EDAC/{i10nm,skx,skx_common}: Support UV systems EDAC/i10nm: Add Intel Clearwater Forest server support * ras/edac-misc: EDAC: Fix typos in comments Signed-off-by: Borislav Petkov (AMD) <[email protected]>
2 parents 6696037 + 586e62f commit 368736d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

drivers/edac/edac_mc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static int edac_mc_alloc_csrows(struct mem_ctl_info *mci)
214214
unsigned int row, chn;
215215

216216
/*
217-
* Alocate and fill the csrow/channels structs
217+
* Allocate and fill the csrow/channels structs
218218
*/
219219
mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL);
220220
if (!mci->csrows)

drivers/edac/edac_mc_sysfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow)
422422
return nr_pages;
423423
}
424424

425-
/* Create a CSROW object under specifed edac_mc_device */
425+
/* Create a CSROW object under specified edac_mc_device */
426426
static int edac_create_csrow_object(struct mem_ctl_info *mci,
427427
struct csrow_info *csrow, int index)
428428
{
@@ -449,7 +449,7 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
449449
return 0;
450450
}
451451

452-
/* Create a CSROW object under specifed edac_mc_device */
452+
/* Create a CSROW object under specified edac_mc_device */
453453
static int edac_create_csrow_objects(struct mem_ctl_info *mci)
454454
{
455455
int err, i;
@@ -636,7 +636,7 @@ static void dimm_release(struct device *dev)
636636
*/
637637
}
638638

639-
/* Create a DIMM object under specifed memory controller device */
639+
/* Create a DIMM object under specified memory controller device */
640640
static int edac_create_dimm_object(struct mem_ctl_info *mci,
641641
struct dimm_info *dimm)
642642
{

drivers/edac/i5000_edac.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,11 @@ struct i5000_pvt {
338338

339339
u16 mir0, mir1, mir2;
340340

341-
u16 b0_mtr[NUM_MTRS]; /* Memory Technlogy Reg */
341+
u16 b0_mtr[NUM_MTRS]; /* Memory Technology Reg */
342342
u16 b0_ambpresent0; /* Branch 0, Channel 0 */
343-
u16 b0_ambpresent1; /* Brnach 0, Channel 1 */
343+
u16 b0_ambpresent1; /* Branch 0, Channel 1 */
344344

345-
u16 b1_mtr[NUM_MTRS]; /* Memory Technlogy Reg */
345+
u16 b1_mtr[NUM_MTRS]; /* Memory Technology Reg */
346346
u16 b1_ambpresent0; /* Branch 1, Channel 8 */
347347
u16 b1_ambpresent1; /* Branch 1, Channel 1 */
348348

@@ -1210,7 +1210,7 @@ static void i5000_get_mc_regs(struct mem_ctl_info *mci)
12101210
&pvt->b0_ambpresent1);
12111211
edac_dbg(2, "\t\tAMB-Branch 0-present1 0x%x:\n", pvt->b0_ambpresent1);
12121212

1213-
/* Only if we have 2 branchs (4 channels) */
1213+
/* Only if we have 2 branches (4 channels) */
12141214
if (pvt->maxch < CHANNELS_PER_BRANCH) {
12151215
pvt->b1_ambpresent0 = 0;
12161216
pvt->b1_ambpresent1 = 0;

0 commit comments

Comments
 (0)