|
@@ -5,12 +5,11 @@
|
|
|
#include <linux/percpu.h>
|
|
|
#include <linux/kexec.h>
|
|
|
#include <linux/crash_dump.h>
|
|
|
-#include <asm/smp.h>
|
|
|
-#include <asm/percpu.h>
|
|
|
+#include <linux/smp.h>
|
|
|
+#include <linux/topology.h>
|
|
|
#include <asm/sections.h>
|
|
|
#include <asm/processor.h>
|
|
|
#include <asm/setup.h>
|
|
|
-#include <asm/topology.h>
|
|
|
#include <asm/mpspec.h>
|
|
|
#include <asm/apicdef.h>
|
|
|
#include <asm/highmem.h>
|
|
@@ -20,8 +19,8 @@ unsigned int num_processors;
|
|
|
unsigned disabled_cpus __cpuinitdata;
|
|
|
/* Processor that is doing the boot up */
|
|
|
unsigned int boot_cpu_physical_apicid = -1U;
|
|
|
-unsigned int max_physical_apicid;
|
|
|
EXPORT_SYMBOL(boot_cpu_physical_apicid);
|
|
|
+unsigned int max_physical_apicid;
|
|
|
|
|
|
/* Bitmask of physically existing CPUs */
|
|
|
physid_mask_t phys_cpu_present_map;
|
|
@@ -289,8 +288,8 @@ static void __cpuinit numa_set_cpumask(int cpu, int enable)
|
|
|
|
|
|
cpulist_scnprintf(buf, sizeof(buf), mask);
|
|
|
printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
|
|
|
- enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf);
|
|
|
- }
|
|
|
+ enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf);
|
|
|
+}
|
|
|
|
|
|
void __cpuinit numa_add_cpu(int cpu)
|
|
|
{
|