From 7898f79654698dcea5a0876785796de67d527ee7 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Sun, 10 Sep 2017 08:52:58 -0700 Subject: [PATCH] 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 Signed-off-by: Andy Lutomirski Signed-off-by: Linus Torvalds --- arch/x86/mm/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index dbbcfd59726a..37689a7cc03b 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. */ -- 2.20.1