---
 arch/x86/kernel/cpu/common.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6/arch/x86/kernel/cpu/common.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/cpu/common.c	2009-10-30 11:56:50.000000000 -0500
+++ linux-2.6/arch/x86/kernel/cpu/common.c	2009-10-30 12:02:38.000000000 -0500
@@ -1101,13 +1101,13 @@ void __cpuinit cpu_init(void)
 	int i;
 
 	cpu = stack_smp_processor_id();
-	t = &per_cpu(init_tss, cpu);
-	orig_ist = &per_cpu(orig_ist, cpu);
+	t = __this_cpu_read(init_tss);
+	orig_ist = __this_cpu_read(orig_ist);
 
 #ifdef CONFIG_NUMA
-	if (cpu != 0 && percpu_read(node_number) == 0 &&
+	if (cpu != 0 && this_cpu_read(node_number) == 0 &&
 	    cpu_to_node(cpu) != NUMA_NO_NODE)
-		percpu_write(node_number, cpu_to_node(cpu));
+		this_cpu_write(node_number, cpu_to_node(cpu));
 #endif
 
 	me = current;
@@ -1144,7 +1144,7 @@ void __cpuinit cpu_init(void)
 	 * set up and load the per-CPU TSS
 	 */
 	if (!orig_ist->ist[0]) {
-		char *estacks = per_cpu(exception_stacks, cpu);
+		char *estacks = __this_cpu_ptr(exception_stacks);
 
 		for (v = 0; v < N_EXCEPTION_STACKS; v++) {
 			estacks += exception_stack_sizes[v];
@@ -1199,7 +1199,7 @@ void __cpuinit cpu_init(void)
 {
 	int cpu = smp_processor_id();
 	struct task_struct *curr = current;
-	struct tss_struct *t = &per_cpu(init_tss, cpu);
+	struct tss_struct *t = __this_cpu_ptr(init_tss);
 	struct thread_struct *thread = &curr->thread;
 
 	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {