Changeset dc5c303 in mainline for kernel/generic/src/mm/tlb.c

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/src/mm/tlb.c (modified) (4 diffs)

kernel/generic/src/mm/tlb.c

@@ -95 +95 @@
                 cpu_t *cpu = &cpus[i];
 
-                irq_spinlock_lock(&cpu->lock, false);
+                irq_spinlock_lock(&cpu->tlb_lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
                         /*
@@ -116 +116 @@
                         cpu->tlb_messages[idx].count = count;
                 }
-                irq_spinlock_unlock(&cpu->lock, false);
+                irq_spinlock_unlock(&cpu->tlb_lock, false);
         }
 
@@ -158 +158 @@
         irq_spinlock_unlock(&tlblock, false);
 
-        irq_spinlock_lock(&CPU->lock, false);
+        irq_spinlock_lock(&CPU->tlb_lock, false);
         assert(CPU->tlb_messages_count <= TLB_MESSAGE_QUEUE_LEN);
 
@@ -189 +189 @@
 
         CPU->tlb_messages_count = 0;
-        irq_spinlock_unlock(&CPU->lock, false);
+        irq_spinlock_unlock(&CPU->tlb_lock, false);
         CPU->tlb_active = true;
 }