From 83d4a18a830efd1659195dbb6bed36677a09916f Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Thu, 13 Sep 2012 17:19:40 +0200 Subject: [PATCH] --- yaml --- r: 336532 b: refs/heads/master c: 11652769179296062c74233e168399a87a3f6e8a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd64_edac.c | 1 + trunk/include/linux/edac.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c5b43e8e548b..65846d2c451a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10de6497a56e933d9ddca94aff186ac3b3105af9 +refs/heads/master: 11652769179296062c74233e168399a87a3f6e8a diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c index cb64bec374d9..307ff66266a0 100644 --- a/trunk/drivers/edac/amd64_edac.c +++ b/trunk/drivers/edac/amd64_edac.c @@ -2518,6 +2518,7 @@ static int amd64_init_one_instance(struct pci_dev *F2) mci->pvt_info = pvt; mci->pdev = &pvt->F2->dev; + mci->csbased = 1; setup_mci_misc_attrs(mci, fam_type); diff --git a/trunk/include/linux/edac.h b/trunk/include/linux/edac.h index bab9f8473dc1..07bda01bf20a 100644 --- a/trunk/include/linux/edac.h +++ b/trunk/include/linux/edac.h @@ -667,6 +667,8 @@ struct mem_ctl_info { u32 fake_inject_ue; u16 fake_inject_count; #endif + __u8 csbased : 1, /* csrow-based memory controller */ + __resv : 7; }; #endif