Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / edac / amd64_edac.c

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index cb64bec374d9f8abd1c1c30d2ad2775bc012dc7e..f74a684269ff6c8ceb25241d82816ddbab035888 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2174,6 +2174,7 @@ static int init_csrows(struct mem_ctl_info *mci)
                        dimm->edac_mode = edac_mode;
                        dimm->nr_pages = nr_pages;
                }
+               csrow->nr_pages = nr_pages;
        }
 
        return empty;
@@ -2518,6 +2519,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);