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

From	Andy Lutomirski <luto@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
Date	2017-09-10 18:00 +0200
Message-ID	<uocOn-5Vf-41@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 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 158acdad2773..1ab3821f9e26 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -261,7 +261,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.13.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID Andy Lutomirski <luto@kernel.org> - 2017-09-10 18:00 +0200
  Re: [PATCH] x86/mm/64: Fix an incorrect warning with  CONFIG_DEBUG_VM=y, !PCID Andy Lutomirski <luto@kernel.org> - 2017-09-10 21:20 +0200
    Re: [PATCH] x86/mm/64: Fix an incorrect warning with  CONFIG_DEBUG_VM=y, !PCID Linus Torvalds <torvalds@linux-foundation.org> - 2017-09-10 21:40 +0200
      Re: [PATCH] x86/mm/64: Fix an incorrect warning with  CONFIG_DEBUG_VM=y, !PCID Andy Lutomirski <luto@kernel.org> - 2017-09-10 21:50 +0200

csiph-web