Index: include/arch.h
===================================================================
--- include/arch.h	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
+++ include/arch.h	(revision aa9551d30eaa623e14ad0adb93951d69fccf962a)
@@ -36,5 +36,5 @@
 #include <arch/cpu.h>
 
-#define CPU		(cpu_private_data[CPU_ID_ARCH].cpu)
+#define CPU		(&cpus[CPU_ID_ARCH])
 #define THREAD		(cpu_private_data[CPU_ID_ARCH].thread)
 #define TASK		(cpu_private_data[CPU_ID_ARCH].task)
Index: include/cpu.h
===================================================================
--- include/cpu.h	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
+++ include/cpu.h	(revision aa9551d30eaa623e14ad0adb93951d69fccf962a)
@@ -74,5 +74,4 @@
  */
 struct cpu_private_data {
-	cpu_t *cpu;
 	thread_t *thread;
 	task_t *task;
Index: src/cpu/cpu.c
===================================================================
--- src/cpu/cpu.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
+++ src/cpu/cpu.c	(revision aa9551d30eaa623e14ad0adb93951d69fccf962a)
@@ -75,6 +75,4 @@
 				list_initialize(&cpus[i].rq[j].rq_head);
 			}
-			
-			cpu_private_data[i].cpu = &cpus[i];
 		}