Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision b2ec5cfd5e00eac7963f5a84fb71f002ad79f1f0)
+++ kernel/generic/include/cpu.h	(revision fbaf6ac810438ece2c6b76f304cd40ab362397c7)
@@ -51,5 +51,5 @@
  */
 typedef struct cpu {
-	IRQ_SPINLOCK_DECLARE(lock);
+	IRQ_SPINLOCK_DECLARE(tlb_lock);
 
 	tlb_shootdown_msg_t tlb_messages[TLB_MESSAGE_QUEUE_LEN];
@@ -97,4 +97,5 @@
 	cpu_arch_t arch;
 
+	IRQ_SPINLOCK_DECLARE(fpu_lock);
 	struct thread *fpu_owner;