diff options
author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:33 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:33 -0400 |
commit | c31fbb1ad890b11f037c16496e53f28877c12722 (patch) | |
tree | 16255a334807034097d581bad2938f377d11a45a /arch/x86_64/kernel/setup.c | |
parent | df3bb57d2c0160ccd1ee51322f50aa295c3b0858 (diff) |
[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: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r-- | arch/x86_64/kernel/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0f86976811d6..b85528597aa8 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
@@ -74,8 +74,6 @@ EXPORT_SYMBOL(boot_cpu_data); | |||
74 | 74 | ||
75 | unsigned long mmu_cr4_features; | 75 | unsigned long mmu_cr4_features; |
76 | 76 | ||
77 | int acpi_numa __initdata; | ||
78 | |||
79 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ | 77 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ |
80 | int bootloader_type; | 78 | int bootloader_type; |
81 | 79 | ||
@@ -812,8 +810,7 @@ static void srat_detect_node(void) | |||
812 | node = first_node(node_online_map); | 810 | node = first_node(node_online_map); |
813 | numa_set_node(cpu, node); | 811 | numa_set_node(cpu, node); |
814 | 812 | ||
815 | if (acpi_numa > 0) | 813 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); |
816 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
817 | #endif | 814 | #endif |
818 | } | 815 | } |
819 | 816 | ||