Changeset dc5c303 in mainline for kernel/arch/amd64/src/pm.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/arch/amd64/src/pm.c (modified) (1 diff)

kernel/arch/amd64/src/pm.c

@@ -39 +39 @@
 #include <mm/as.h>
 #include <mm/frame.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdlib.h>