Changeset 0aa06cbe in mainline for kernel/arch/amd64
- Timestamp:
- 2018-03-06T20:48:12Z (8 years ago)
- 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)
- Location:
- kernel/arch/amd64
- Files:
-
- 4 added
- 4 deleted
- 5 edited
-
Makefile.inc (modified) (1 diff)
-
include/arch/boot/memmap_struct.ag (deleted)
-
include/arch/boot/memmap_struct.h (added)
-
include/arch/context_struct.ag (deleted)
-
include/arch/context_struct.h (added)
-
include/arch/istate_struct.ag (deleted)
-
include/arch/istate_struct.h (added)
-
include/arch/kseg_struct.ag (deleted)
-
include/arch/kseg_struct.h (added)
-
src/asm.S (modified) (2 diffs)
-
src/boot/multiboot.S (modified) (1 diff)
-
src/context.S (modified) (1 diff)
-
src/smp/ap.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/amd64/Makefile.inc
rfd57cf17 r0aa06cbe 86 86 87 87 ARCH_AUTOGENS_AG = \ 88 arch/$(KARCH)/include/arch/istate_struct.ag \89 arch/$(KARCH)/include/arch/context_struct.ag \90 arch/$(KARCH)/include/arch/kseg_struct.ag \91 arch/$(KARCH)/include/arch/boot/memmap_struct.ag 88 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 89 arch/$(KARCH)/include/arch/context_struct.ag.h \ 90 arch/$(KARCH)/include/arch/kseg_struct.ag.h \ 91 arch/$(KARCH)/include/arch/boot/memmap_struct.ag.h -
kernel/arch/amd64/src/asm.S
rfd57cf17 r0aa06cbe 30 30 #include <arch/pm.h> 31 31 #include <arch/mm/page.h> 32 #include <arch/istate_struct. h>33 #include <arch/kseg_struct. h>32 #include <arch/istate_struct.ag.h> 33 #include <arch/kseg_struct.ag.h> 34 34 #include <arch/cpu.h> 35 35 #include <arch/smp/apic.h> … … 541 541 ret 542 542 FUNCTION_END(early_putchar) 543 -
kernel/arch/amd64/src/boot/multiboot.S
rfd57cf17 r0aa06cbe 720 720 status_main: 721 721 .asciz "[main] " 722 -
kernel/arch/amd64/src/context.S
rfd57cf17 r0aa06cbe 28 28 29 29 #include <abi/asmtool.h> 30 #include <arch/context_struct. h>30 #include <arch/context_struct.ag.h> 31 31 #include <arch/vreg.h> 32 32 -
kernel/arch/amd64/src/smp/ap.S
rfd57cf17 r0aa06cbe 39 39 #include <arch/cpu.h> 40 40 #include <arch/cpuid.h> 41 #include <arch/context_struct. h>41 #include <arch/context_struct.ag.h> 42 42 43 43 .section K_TEXT_START, "ax"
Note:
See TracChangeset
for help on using the changeset viewer.
