From 728a930d4408f32a3016c6d866415e27eba164d5 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 26 Sep 2006 10:52:33 +0200 Subject: [PATCH] --- yaml --- r: 35854 b: refs/heads/master c: c31fbb1ad890b11f037c16496e53f28877c12722 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 5 +---- trunk/arch/x86_64/mm/srat.c | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9228807bbbee..6e6d94a1294d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df3bb57d2c0160ccd1ee51322f50aa295c3b0858 +refs/heads/master: c31fbb1ad890b11f037c16496e53f28877c12722 diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index 0f86976811d6..b85528597aa8 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/arch/x86_64/kernel/setup.c @@ -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,8 +810,7 @@ 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); + printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); #endif } diff --git a/trunk/arch/x86_64/mm/srat.c b/trunk/arch/x86_64/mm/srat.c index 502fce65e96a..ca10701e7a90 100644 --- a/trunk/arch/x86_64/mm/srat.c +++ b/trunk/arch/x86_64/mm/srat.c @@ -21,6 +21,8 @@ #include #include +int acpi_numa __initdata; + #if (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) \ && !defined(CONFIG_MEMORY_HOTPLUG)