[PATCH] x86_64: Node local pda take 2 -- cpu_pda preparation

Helper patch to change cpu_pda users to use macros to access cpu_pda
instead of the cpu_pda[] array.

Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 972f5d4ce82..66325a79ed5 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -30,7 +30,7 @@ char x86_boot_params[BOOT_PARAM_SIZE] __initdata = {0,};
 
 cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
 
-struct x8664_pda cpu_pda[NR_CPUS] __cacheline_aligned; 
+struct x8664_pda _cpu_pda[NR_CPUS] __cacheline_aligned;
 
 struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table }; 
 
@@ -110,18 +110,18 @@ void __init setup_per_cpu_areas(void)
                 }
                 if (!ptr)
                         panic("Cannot allocate cpu data for CPU %d\n", i);
-                cpu_pda[i].data_offset = ptr - __per_cpu_start;
+                cpu_pda(i)->data_offset = ptr - __per_cpu_start;
                 memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
         }
 } 
 
 void pda_init(int cpu)
 { 
-        struct x8664_pda *pda = &cpu_pda[cpu];
+        struct x8664_pda *pda = cpu_pda(cpu);
 
         /* Setup up data that may be needed in __get_free_pages early */
         asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); 
-        wrmsrl(MSR_GS_BASE, cpu_pda + cpu);
+        wrmsrl(MSR_GS_BASE, pda);
 
         pda->cpunumber = cpu; 
         pda->irqcount = -1;