1 files changed, 8 insertions, 2 deletions

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 798bf9835a51..e566ff43884a 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -163,8 +163,14 @@ per_cpu_init (void)
          * get_zeroed_page().
          */
         if (first_time) {
+                void *cpu0_data = __phys_per_cpu_start - PERCPU_PAGE_SIZE;
+
                 first_time=0;
-                for (cpu = 0; cpu < NR_CPUS; cpu++) {
+
+                __per_cpu_offset[0] = (char *) cpu0_data - __per_cpu_start;
+                per_cpu(local_per_cpu_offset, 0) = __per_cpu_offset[0];
+
+                for (cpu = 1; cpu < NR_CPUS; cpu++) {
                         memcpy(cpu_data, __phys_per_cpu_start, __per_cpu_end - __per_cpu_start);
                         __per_cpu_offset[cpu] = (char *) cpu_data - __per_cpu_start;
                         cpu_data += PERCPU_PAGE_SIZE;
@@ -177,7 +183,7 @@ per_cpu_init (void)
 static inline void
 alloc_per_cpu_data(void)
 {
-        cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS,
+        cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS-1,
                                    PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
 }
 #else