numa.c (8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d) | numa.c (c08888cf3c80fe07bfd176113c390ca31d3ba5c2) |
---|---|
1/* 2 * pSeries NUMA support 3 * 4 * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM 5 * 6 * This program is free software; you can redistribute it and/or 7 * modify it under the terms of the GNU General Public License 8 * as published by the Free Software Foundation; either version --- 361 unchanged lines hidden (view full) --- 370 371 return lmb_end_of_DRAM() - start; 372} 373 374static int __init parse_numa_properties(void) 375{ 376 struct device_node *cpu = NULL; 377 struct device_node *memory = NULL; | 1/* 2 * pSeries NUMA support 3 * 4 * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM 5 * 6 * This program is free software; you can redistribute it and/or 7 * modify it under the terms of the GNU General Public License 8 * as published by the Free Software Foundation; either version --- 361 unchanged lines hidden (view full) --- 370 371 return lmb_end_of_DRAM() - start; 372} 373 374static int __init parse_numa_properties(void) 375{ 376 struct device_node *cpu = NULL; 377 struct device_node *memory = NULL; |
378 int max_domain; | 378 int max_domain = 0; |
379 unsigned long i; 380 381 if (numa_enabled == 0) { 382 printk(KERN_WARNING "NUMA disabled by user\n"); 383 return -1; 384 } 385 386 min_common_depth = find_min_common_depth(); 387 388 dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth); 389 if (min_common_depth < 0) 390 return min_common_depth; 391 | 379 unsigned long i; 380 381 if (numa_enabled == 0) { 382 printk(KERN_WARNING "NUMA disabled by user\n"); 383 return -1; 384 } 385 386 min_common_depth = find_min_common_depth(); 387 388 dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth); 389 if (min_common_depth < 0) 390 return min_common_depth; 391 |
392 max_domain = numa_setup_cpu(boot_cpuid); 393 | |
394 /* 395 * Even though we connect cpus to numa domains later in SMP init, 396 * we need to know the maximum node id now. This is because each 397 * node id must have NODE_DATA etc backing it. 398 * As a result of hotplug we could still have cpus appear later on 399 * with larger node ids. In that case we force the cpu into node 0. 400 */ 401 for_each_cpu(i) { --- 62 unchanged lines hidden (view full) --- 464 465 if (--ranges) 466 goto new_range; 467 } 468 469 for (i = 0; i <= max_domain; i++) 470 node_set_online(i); 471 | 392 /* 393 * Even though we connect cpus to numa domains later in SMP init, 394 * we need to know the maximum node id now. This is because each 395 * node id must have NODE_DATA etc backing it. 396 * As a result of hotplug we could still have cpus appear later on 397 * with larger node ids. In that case we force the cpu into node 0. 398 */ 399 for_each_cpu(i) { --- 62 unchanged lines hidden (view full) --- 462 463 if (--ranges) 464 goto new_range; 465 } 466 467 for (i = 0; i <= max_domain; i++) 468 node_set_online(i); 469 |
470 max_domain = numa_setup_cpu(boot_cpuid); 471 |
|
472 return 0; 473} 474 475static void __init setup_nonnuma(void) 476{ 477 unsigned long top_of_ram = lmb_end_of_DRAM(); 478 unsigned long total_ram = lmb_phys_mem_size(); 479 unsigned int i; --- 336 unchanged lines hidden --- | 472 return 0; 473} 474 475static void __init setup_nonnuma(void) 476{ 477 unsigned long top_of_ram = lmb_end_of_DRAM(); 478 unsigned long total_ram = lmb_phys_mem_size(); 479 unsigned int i; --- 336 unchanged lines hidden --- |