1 files changed, 5 insertions, 2 deletions
diff --git a/sys/include/arch/amd64/cpu.h b/sys/include/arch/amd64/cpu.h
index 59d1dcd..e93e8a2 100644
--- a/sys/include/arch/amd64/cpu.h
+++ b/sys/include/arch/amd64/cpu.h
@@ -46,10 +46,13 @@
  *      acquire the spinlock themselves!
  */
 struct cpu_info {
+    /* Per-arch fields  */
     void *pmap;                         /* Current pmap */
-    uint32_t lapic_id;
-    volatile size_t lapic_tmr_freq;
+    uint32_t id;
     struct spinlock lock;
+
+    /* AMD64 */
+    volatile size_t lapic_tmr_freq;
 };
 
 struct cpu_info *amd64_this_cpu(void);