lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86-64: Use SRAT data on Intel systems too.

Browse Source 
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen
2005-09-12 18:49:24 +02:00
committed by Linus Torvalds
parent 3f098c2605
commit df0cc26b1b
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86_64/kernel/setup.c
View File

@@ -942,6 +942,25 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
return 1; return 1;
} }
static void srat_detect_node(void)
{
#ifdef CONFIG_NUMA
unsigned apicid, node;
int cpu = smp_processor_id();
/* Don't do the funky fallback heuristics the AMD version employs
for now. */
apicid = phys_proc_id[cpu];
node = apicid_to_node[apicid];
if (node == NUMA_NO_NODE)
node = 0;
cpu_to_node[cpu] = node;
if (acpi_numa > 0)
printk(KERN_INFO "CPU %d -> Node %d\n", cpu, node);
#endif
}
static void __cpuinit init_intel(struct cpuinfo_x86 *c) static void __cpuinit init_intel(struct cpuinfo_x86 *c)
{ {
/* Cache sizes */ /* Cache sizes */
@@ -960,6 +979,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
if (c->x86 >= 15) if (c->x86 >= 15)
set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability); set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
c->x86_num_cores = intel_num_cpu_cores(c); c->x86_num_cores = intel_num_cpu_cores(c);
srat_detect_node();
} }
static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)