Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Venkatesh Srinivas <venkateshs@chromium.org>
To:     hpa@zytor.com, linux-kernel@vger.kernel.org,
        venkateshs@chromium.org, vsrinivas@ops101.org
Subject: [PATCH] x86/cpu/amd: Remove duplicate definition of MSRC001_1029
Date:   Tue, 23 Mar 2021 21:04:02 +0000
Message-Id: <20210323210402.456329-1-venkateshs@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

MSRC001_1029 had duplicate definitions in msr-index.h and
amd.c. Remove the local definition in favor of the more
widely used version.

Signed-off-by: Venkatesh Srinivas <venkateshs@chromium.org>
---
 arch/x86/kernel/cpu/amd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 347a956f71ca..31c592e5096e 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -795,15 +795,13 @@ static void init_amd_gh(struct cpuinfo_x86 *c)
 		set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
 }
 
-#define MSR_AMD64_DE_CFG	0xC0011029
-
 static void init_amd_ln(struct cpuinfo_x86 *c)
 {
 	/*
 	 * Apply erratum 665 fix unconditionally so machines without a BIOS
 	 * fix work.
 	 */
-	msr_set_bit(MSR_AMD64_DE_CFG, 31);
+	msr_set_bit(MSR_F10H_DECFG, 31);
 }
 
 static bool rdrand_force;
-- 
2.31.0.291.g576ba9dcdaf-goog