fix up queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch

diff --git a/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch b/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch
index ada320820f3d91e78173945030a49cf04251b298..ed29423e2084735e7aca72d9ae12f44e8bf0fe91 100644 (file)
--- a/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch
+++ b/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch
@@ -16,13 +16,13 @@ Link: https://lkml.kernel.org/r/20200510204842.2603-4-amonakov@ispras.ru
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/edac/amd64_edac.c |   14 ++++++++++++++
+ drivers/edac/amd64_edac.c |   13 +++++++++++++
  drivers/edac/amd64_edac.h |    3 +++
- 2 files changed, 17 insertions(+)
+ 2 files changed, 16 insertions(+)
 
 --- a/drivers/edac/amd64_edac.c
 +++ b/drivers/edac/amd64_edac.c
-@@ -2317,6 +2317,16 @@ static struct amd64_family_type family_t
+@@ -2317,6 +2317,15 @@ static struct amd64_family_type family_t
                        .dbam_to_cs             = f17_addr_mask_to_cs_size,
                }
        },
@@ -30,7 +30,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +              .ctl_name = "F17h_M60h",
 +              .f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0,
 +              .f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6,
-+              .max_mcs = 2,
 +              .ops = {
 +                      .early_channel_count    = f17_early_channel_count,
 +                      .dbam_to_cs             = f17_addr_mask_to_cs_size,
@@ -39,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        [F17_M70H_CPUS] = {
                .ctl_name = "F17h_M70h",
                .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0,
-@@ -3366,6 +3376,10 @@ static struct amd64_family_type *per_fam
+@@ -3366,6 +3375,10 @@ static struct amd64_family_type *per_fam
                        fam_type = &family_types[F17_M30H_CPUS];
                        pvt->ops = &family_types[F17_M30H_CPUS].ops;
                        break;