summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-15 12:32:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-15 12:32:06 -0700
commit19ca90de49c3269874722148edf07083182e23ec (patch)
tree89e29a689bf7dda58cde50e24d7afc805f6d13b2 /arch
parent68d54d3ff3e872009ff7a003d5c43816e1f7864b (diff)
parent162ee5a8ab49be40d253f90e94aef712470a3a24 (diff)
downloadlinux-stable-19ca90de49c3269874722148edf07083182e23ec.tar.gz
linux-stable-19ca90de49c3269874722148edf07083182e23ec.tar.bz2
linux-stable-19ca90de49c3269874722148edf07083182e23ec.zip
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 EFI bootup fixlet from Thomas Gleixner: "A single fix for an early boot warning caused by invoking this_cpu_has() before SMP initialization" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Fix bogus warning during EFI bootup, use boot_cpu_has() instead of this_cpu_has() in build_cr3_noflush()
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/tlbflush.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 84137c22fdfa..6690cd3fc8b1 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -131,7 +131,12 @@ static inline unsigned long build_cr3(pgd_t *pgd, u16 asid)
static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid)
{
VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE);
- VM_WARN_ON_ONCE(!this_cpu_has(X86_FEATURE_PCID));
+ /*
+ * Use boot_cpu_has() instead of this_cpu_has() as this function
+ * might be called during early boot. This should work even after
+ * boot because all CPU's the have same capabilities:
+ */
+ VM_WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_PCID));
return __sme_pa(pgd) | kern_pcid(asid) | CR3_NOFLUSH;
}