[IA64] Minimize per_cpu reservations.

This attached patch significantly shrinks boot memory allocation on ia64.
It does this by not allocating per_cpu areas for cpus that can never
exist.

In the case where acpi does not have any numa node description of the
cpus, I defaulted to assigning the first 32 round-robin on the known
nodes..  For the !CONFIG_ACPI  I used for_each_possible_cpu().

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

5 files changed, 13 insertions, 11 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 78f28d825f30..c7467f863c7a 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -423,6 +423,7 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];
 #define pxm_bit_set(bit)        (set_bit(bit,(void *)pxm_flag))
 #define pxm_bit_test(bit)       (test_bit(bit,(void *)pxm_flag))
 static struct acpi_table_slit __initdata *slit_table;
+cpumask_t early_cpu_possible_map = CPU_MASK_NONE;
 
 static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
 {
@@ -482,6 +483,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
             (pa->apic_id << 8) | (pa->local_sapic_eid);
         /* nid should be overridden as logical node id later */
         node_cpuid[srat_num_cpus].nid = pxm;
+        cpu_set(srat_num_cpus, early_cpu_possible_map);
         srat_num_cpus++;
 }
 
@@ -559,7 +561,7 @@ void __init acpi_numa_arch_fixup(void)
         }
 
         /* set logical node id in cpu structure */
-        for (i = 0; i < srat_num_cpus; i++)
+        for_each_possible_early_cpu(i)
                 node_cpuid[i].nid = pxm_to_node(node_cpuid[i].nid);
 
         printk(KERN_INFO "Number of logical nodes in system = %d\n",
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index a78b45f5fe2f..c93420c97409 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -73,7 +73,7 @@ void __init build_cpu_to_node_map(void)
         for(node=0; node < MAX_NUMNODES; node++)
                 cpus_clear(node_to_cpu_mask[node]);
 
-        for(cpu = 0; cpu < NR_CPUS; ++cpu) {
+        for_each_possible_early_cpu(cpu) {
                 node = -1;
                 for (i = 0; i < NR_CPUS; ++i)
                         if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 4aa9eaea76c3..6206541f9e87 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -493,6 +493,8 @@ setup_arch (char **cmdline_p)
         acpi_table_init();
 # ifdef CONFIG_ACPI_NUMA
         acpi_numa_init();
+        per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ?
+                32 : cpus_weight(early_cpu_possible_map)), additional_cpus);
 # endif
 #else
 # ifdef CONFIG_SMP
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 06c540a29467..6136a4c6df11 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -104,7 +104,7 @@ static int __meminit early_nr_cpus_node(int node)
 {
         int cpu, n = 0;
 
-        for (cpu = 0; cpu < NR_CPUS; cpu++)
+        for_each_possible_early_cpu(cpu)
                 if (node == node_cpuid[cpu].nid)
                         n++;
 
@@ -143,7 +143,7 @@ static void *per_cpu_node_setup(void *cpu_data, int node)
 #ifdef CONFIG_SMP
         int cpu;
 
-        for (cpu = 0; cpu < NR_CPUS; cpu++) {
+        for_each_possible_early_cpu(cpu) {
                 if (node == node_cpuid[cpu].nid) {
                         memcpy(__va(cpu_data), __phys_per_cpu_start,
                                __per_cpu_end - __per_cpu_start);
@@ -346,7 +346,7 @@ static void __init initialize_pernode_data(void)
 
 #ifdef CONFIG_SMP
         /* Set the node_data pointer for each per-cpu struct */
-        for (cpu = 0; cpu < NR_CPUS; cpu++) {
+        for_each_possible_early_cpu(cpu) {
                 node = node_cpuid[cpu].nid;
                 per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;
         }
@@ -494,13 +494,9 @@ void __cpuinit *per_cpu_init(void)
         int cpu;
         static int first_time = 1;
 
-
-        if (smp_processor_id() != 0)
-                return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
-
         if (first_time) {
                 first_time = 0;
-                for (cpu = 0; cpu < NR_CPUS; cpu++)
+                for_each_possible_early_cpu(cpu)
                         per_cpu(local_per_cpu_offset, cpu) = __per_cpu_offset[cpu];
         }
 
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 7807fc5c0422..b73bf1838e57 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -27,7 +27,9 @@
  */
 int num_node_memblks;
 struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
-struct node_cpuid_s node_cpuid[NR_CPUS];
+struct node_cpuid_s node_cpuid[NR_CPUS] =
+        { [0 ... NR_CPUS-1] = { .phys_id = 0, .nid = NUMA_NO_NODE } };
+
 /*
  * This is a matrix with "distances" between nodes, they should be
  * proportional to the memory access latency ratios.