From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751571AbdIJPxB (ORCPT ); Sun, 10 Sep 2017 11:53:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbdIJPxA (ORCPT ); Sun, 10 Sep 2017 11:53:00 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F06D2195D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=luto@kernel.org From: Andy Lutomirski To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Linus Torvalds , Andy Lutomirski Subject: [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID Date: Sun, 10 Sep 2017 08:52:58 -0700 Message-Id: <2e912161bd29ce6b3e7dc5fbb921cc912ea20e29.1505058745.git.luto@kernel.org> X-Mailer: git-send-email 2.13.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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