Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 46732dc3b73c..99b920d0e516 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -433,9 +433,15 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
                 int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
 
                 if (c->phys_proc_id == o->phys_proc_id &&
-                    per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2) &&
-                    c->cpu_core_id == o->cpu_core_id)
-                        return topology_sane(c, o, "smt");
+                    per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2)) {
+                        if (c->cpu_core_id == o->cpu_core_id)
+                                return topology_sane(c, o, "smt");
+
+                        if ((c->cu_id != 0xff) &&
+                            (o->cu_id != 0xff) &&
+                            (c->cu_id == o->cu_id))
+                                return topology_sane(c, o, "smt");
+                }
 
         } else if (c->phys_proc_id == o->phys_proc_id &&
                    c->cpu_core_id == o->cpu_core_id) {