Merge tag 'x86_cpu_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 cpuid updates from Borislav Petkov:

 - Get rid of static_cpu_has() - one less API to care about testing CPU
   features

 - Unify the handling of CPU core types (performance, efficient, etc) by
   mapping the vendor-specific types to Linux ones

 - Continuation of the work of Ahmed Darwish to centralize CPUID leaf
   representation

* tag 'x86_cpu_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/CPU: Rename struct cpuid_read_output to struct cpuid_output
  x86/cpu/scattered: Sort it properly
  x86/cpu: Use parsed CPUID(0x1)
  x86/lib: Add CPUID(0x1) family and model calculation
  x86/cpu: Use parsed CPUID(0x0)
  x86/cpu/transmeta: Rescan CPUID(0x1) after modifying capabilities
  x86/topology: Add TOPO_CPU_TYPE_LOW_POWER
  x86/topology: Name the AMD core-type values
  x86/topo: Map vendor CPU types to generic Linux such types
  x86/bugs: Don't use cpu-type matching in cpu_vuln_blacklist
  x86/cpu: Hide and rename static_cpu_has()

diff --cc arch/x86/events/amd/core.c
Simple merge

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/events/intel/lbr.c
Simple merge

diff --cc arch/x86/events/perf_event.h
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/cpu/bugs.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/topology_common.c
Simple merge

diff --cc arch/x86/kernel/cpu/transmeta.c
index c670fbb6ee5094814a397ee1bbcd6a23070906d6,d9e0edb379b80a249e57ce4699766dfd216e0753..3e04b5d01bf8965d54bb8e25785acc1f6905e81a
--- 1/arch/x86/kernel/cpu/transmeta.c
--- 2/arch/x86/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
@@@ -87,10 -86,11 +87,11 @@@ static void init_transmeta(struct cpuin
        }
  
        /* Unhide possibly hidden capability flags */
 -      rdmsr(0x80860004, cap_mask, uk);
 -      wrmsr(0x80860004, ~0, uk);
 +      rdmsrq(0x80860004, msr);
 +      wrmsrq(0x80860004, msr | ~0U);
+       cpuid_refresh_leaf(c, 0x1);
        c->x86_capability[CPUID_1_EDX] = cpuid_edx(0x00000001);
 -      wrmsr(0x80860004, cap_mask, uk);
 +      wrmsrq(0x80860004, msr);
  
        /* All Transmeta CPUs have a constant TSC */
        set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

diff --cc arch/x86/kernel/fpu/core.c
Simple merge

diff --cc arch/x86/kernel/kprobes/opt.c
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/mm/pat/set_memory.c
Simple merge

diff --cc arch/x86/mm/tlb.c
Simple merge

diff --cc drivers/firewire/ohci.c
Simple merge

diff --cc drivers/thermal/intel/therm_throt.c
Simple merge