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()

+6 -1
+6 -1
arch/x86/include/asm/tlbflush.h
··· 131 131 static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid) 132 132 { 133 133 VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); 134 - VM_WARN_ON_ONCE(!this_cpu_has(X86_FEATURE_PCID)); 134 + /* 135 + * Use boot_cpu_has() instead of this_cpu_has() as this function 136 + * might be called during early boot. This should work even after 137 + * boot because all CPU's the have same capabilities: 138 + */ 139 + VM_WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_PCID)); 135 140 return __sme_pa(pgd) | kern_pcid(asid) | CR3_NOFLUSH; 136 141 } 137 142