Changeset f2cb80a in mainline for kernel/generic/src/time/timeout.c

Timestamp:

2024-02-23T17:57:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (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@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/generic/src/time/timeout.c (modified) (1 diff)

kernel/generic/src/time/timeout.c

@@ -77 +77 @@
                 return 0;
 
-        return CPU->current_clock_tick + us2ticks(usec);
+        return CPU_LOCAL->current_clock_tick + us2ticks(usec);
 }