Pull percpureserve into release branch

2 files changed, 8 insertions, 9 deletions

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index ee5e68b2af94..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++;
 
@@ -124,6 +124,7 @@ static unsigned long __meminit compute_pernodesize(int node)
         pernodesize += node * L1_CACHE_BYTES;
         pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t));
         pernodesize += L1_CACHE_ALIGN(sizeof(struct ia64_node_data));
+        pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t));
         pernodesize = PAGE_ALIGN(pernodesize);
         return pernodesize;
 }
@@ -142,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);
@@ -345,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;
         }
@@ -493,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.