Changeset 0aa06cbe in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2018-03-06T20:48:12Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

fd57cf17 (diff), 0c793e2 (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 20:48:12)

git-committer:

GitHub <noreply@…> (2018-03-06 20:48:12)

Message:

Merge 0c793e2e9c4358a2bb2521d35eb36b273cf0283b into fd57cf17d12bbe3b41626a0b8708f075134a073e

File:

• kernel/arch/amd64/src/asm.S (modified) (2 diffs)

kernel/arch/amd64/src/asm.S

@@ -30 +30 @@
 #include <arch/pm.h>
 #include <arch/mm/page.h>
-#include <arch/istate_struct.h>
-#include <arch/kseg_struct.h>
+#include <arch/istate_struct.ag.h>
+#include <arch/kseg_struct.ag.h>
 #include <arch/cpu.h>
 #include <arch/smp/apic.h>
@@ -541 +541 @@
         ret
 FUNCTION_END(early_putchar)
+