Commit c31fbb1a authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen

[PATCH] Clean up acpi_numa variable

Move it into srat.c No need to clutter up setup.c for it

And remove use in setup.c completely - it only guarded a printk
which can be done unconditionally.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent df3bb57d
...@@ -74,8 +74,6 @@ EXPORT_SYMBOL(boot_cpu_data); ...@@ -74,8 +74,6 @@ EXPORT_SYMBOL(boot_cpu_data);
unsigned long mmu_cr4_features; unsigned long mmu_cr4_features;
int acpi_numa __initdata;
/* Boot loader ID as an integer, for the benefit of proc_dointvec */ /* Boot loader ID as an integer, for the benefit of proc_dointvec */
int bootloader_type; int bootloader_type;
...@@ -812,7 +810,6 @@ static void srat_detect_node(void) ...@@ -812,7 +810,6 @@ static void srat_detect_node(void)
node = first_node(node_online_map); node = first_node(node_online_map);
numa_set_node(cpu, node); numa_set_node(cpu, node);
if (acpi_numa > 0)
printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node);
#endif #endif
} }
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <asm/numa.h> #include <asm/numa.h>
#include <asm/e820.h> #include <asm/e820.h>
int acpi_numa __initdata;
#if (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ #if (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) \ defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) \
&& !defined(CONFIG_MEMORY_HOTPLUG) && !defined(CONFIG_MEMORY_HOTPLUG)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment