1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index d6c0c6590607..b86228cce672 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2642,8 +2642,15 @@ static int amd64_init_one_instance(struct pci_dev *F2)
         layers[0].size = pvt->csels[0].b_cnt;
         layers[0].is_virt_csrow = true;
         layers[1].type = EDAC_MC_LAYER_CHANNEL;
-        layers[1].size = pvt->channel_count;
+
+        /*
+         * Always allocate two channels since we can have setups with DIMMs on
+         * only one channel. Also, this simplifies handling later for the price
+         * of a couple of KBs tops.
+         */
+        layers[1].size = 2;
         layers[1].is_virt_csrow = false;
+
         mci = edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, 0);
         if (!mci)
                 goto err_siblings;