diff options
| author | Andy Lutomirski <luto@kernel.org> | 2017-09-10 08:52:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-10 09:55:35 -0700 |
| commit | 7898f79654698dcea5a0876785796de67d527ee7 (patch) | |
| tree | 6891712fbe292d6e48d12471078f8ea047aa4d86 | |
| parent | 4dfc2788033d30dfccfd4268e06dd73ce2c654ed (diff) | |
| download | linux-7898f79654698dcea5a0876785796de67d527ee7.tar.bz2 | |
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>
| -rw-r--r-- | arch/x86/mm/tlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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. */ |