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

[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

arch/x86_64/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ EXPORT_SYMBOL(boot_cpu_data); 


unsigned long mmu_cr4_features;



int acpi_numa __initdata;



/* Boot loader ID as an integer, for the benefit of proc_dointvec */

int bootloader_type;
@@ -812,7 +810,6 @@ static void srat_detect_node(void) 
		node = first_node(node_online_map);

	numa_set_node(cpu, node);



	if (acpi_numa > 0)

	printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node);

#endif

}

arch/x86_64/mm/srat.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <asm/numa.h>

#include <asm/e820.h>



int acpi_numa __initdata;



#if (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \

	defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) \

		&& !defined(CONFIG_MEMORY_HOTPLUG)