Changeset dc5c303 in mainline for kernel/generic/include/cpu.h

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/include/cpu.h (modified) (3 diffs)

kernel/generic/include/cpu.h

@@ -51 +51 @@
  */
 typedef struct cpu {
-        IRQ_SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(tlb_lock);
 
         tlb_shootdown_msg_t tlb_messages[TLB_MESSAGE_QUEUE_LEN];
@@ -81 +81 @@
         bool idle;
         uint64_t last_cycle;
-        uint64_t idle_cycles;
-        uint64_t busy_cycles;
+        atomic_time_stat_t idle_cycles;
+        atomic_time_stat_t busy_cycles;
 
         /**
@@ -97 +97 @@
         cpu_arch_t arch;
 
-        struct thread *fpu_owner;
+#ifdef CONFIG_FPU_LAZY
+        /* For synchronization between FPU trap and thread destructor. */
+        IRQ_SPINLOCK_DECLARE(fpu_lock);
+#endif
+        _Atomic(struct thread *) fpu_owner;
 
         /**