From: Andy Lutomirski <luto@kernel.org>
Date: Sun, 10 Sep 2017 15:52:58 +0000 (-0700)
Subject: x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
X-Git-Tag: v4.14-rc1~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7898f79654698dcea5a0876785796de67d527ee7;p=platform%2Fkernel%2Flinux-rpi3.git

x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID

I've been staring at the word PCID too long.

Fixes: f13c8e8c58ba ("x86/mm: Reinitialize TLB state on hotplug and resume")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index dbbcfd5..37689a7 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -241,7 +241,7 @@ void initialize_tlbstate_and_flush(void)
 	 * doesn't work like other CR4 bits because it can only be set from
 	 * long mode.)
 	 */
-	WARN_ON(boot_cpu_has(X86_CR4_PCIDE) &&
+	WARN_ON(boot_cpu_has(X86_FEATURE_PCID) &&
 		!(cr4_read_shadow() & X86_CR4_PCIDE));
 
 	/* Force ASID 0 and force a TLB flush. */