From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 19 May 2018 06:18:56 +0000 (+0200)
Subject: Merge branches 'x86/urgent' and 'core/urgent' into x86/boot, to pick up fixes and... 
X-Git-Tag: v4.18-rc1~163^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=177bfd725bd1b67c7254248cf19f0465d493e631;p=linux.git

Merge branches 'x86/urgent' and 'core/urgent' into x86/boot, to pick up fixes and avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

177bfd725bd1b67c7254248cf19f0465d493e631
diff --cc arch/x86/kernel/smpboot.c
index 91d48f3eeda8,0f1cbb042f49,0f1cbb042f49..734e57847917
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@@ -77,7 -77,16 -77,16 +77,9 @@@@
   #include <asm/i8259.h>
   #include <asm/misc.h>
   #include <asm/qspinlock.h>
+  #include <asm/intel-family.h>
+  #include <asm/cpu_device_id.h>
   
 --/* Number of siblings per CPU package */
 --int smp_num_siblings = 1;
 --EXPORT_SYMBOL(smp_num_siblings);
 --
 --/* Last level cache ID of each logical CPU */
 --DEFINE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id) = BAD_APICID;
 --
   /* representing HT siblings of each logical CPU */
   DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);
   EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);