Changeset 0aa06cbe in mainline for kernel/arch
- 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
- Files:
-
- 11 added
- 11 deleted
- 19 edited
-
amd64/Makefile.inc (modified) (1 diff)
-
amd64/include/arch/boot/memmap_struct.ag (deleted)
-
amd64/include/arch/boot/memmap_struct.h (added)
-
amd64/include/arch/context_struct.ag (deleted)
-
amd64/include/arch/context_struct.h (added)
-
amd64/include/arch/istate_struct.ag (deleted)
-
amd64/include/arch/istate_struct.h (added)
-
amd64/include/arch/kseg_struct.ag (deleted)
-
amd64/include/arch/kseg_struct.h (added)
-
amd64/src/asm.S (modified) (2 diffs)
-
amd64/src/boot/multiboot.S (modified) (1 diff)
-
amd64/src/context.S (modified) (1 diff)
-
amd64/src/smp/ap.S (modified) (1 diff)
-
arm32/Makefile.inc (modified) (1 diff)
-
arm32/include/arch/context_struct.ag (deleted)
-
arm32/include/arch/context_struct.h (added)
-
arm32/include/arch/istate_struct.ag (deleted)
-
arm32/include/arch/istate_struct.h (added)
-
ia32/Makefile.inc (modified) (1 diff)
-
ia32/include/arch/boot/memmap.h (modified) (2 diffs)
-
ia32/include/arch/boot/memmap_struct.ag (deleted)
-
ia32/include/arch/boot/memmap_struct.h (added)
-
ia32/include/arch/context_struct.ag (deleted)
-
ia32/include/arch/context_struct.h (added)
-
ia32/include/arch/istate_struct.ag (deleted)
-
ia32/include/arch/istate_struct.h (added)
-
ia32/src/asm.S (modified) (2 diffs)
-
ia32/src/context.S (modified) (1 diff)
-
ia32/src/smp/ap.S (modified) (1 diff)
-
ia64/Makefile.inc (modified) (1 diff)
-
ia64/include/arch/context_struct.ag (deleted)
-
ia64/include/arch/context_struct.h (added)
-
ia64/include/arch/interrupt.h (modified) (1 diff)
-
ia64/include/arch/istate_struct.ag (deleted)
-
ia64/include/arch/istate_struct.h (added)
-
ia64/src/context.S (modified) (1 diff)
-
ia64/src/ivt.S (modified) (1 diff)
-
mips32/Makefile.inc (modified) (1 diff)
-
ppc32/Makefile.inc (modified) (1 diff)
-
riscv64/Makefile.inc (modified) (1 diff)
-
sparc64/Makefile.inc (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" -
kernel/arch/arm32/Makefile.inc
rfd57cf17 r0aa06cbe 96 96 ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c 97 97 endif 98 99 ARCH_AUTOGENS_AG = \100 arch/$(KARCH)/include/arch/istate_struct.ag \101 arch/$(KARCH)/include/arch/context_struct.ag102 -
kernel/arch/ia32/Makefile.inc
rfd57cf17 r0aa06cbe 103 103 104 104 ARCH_AUTOGENS_AG = \ 105 arch/$(KARCH)/include/arch/istate_struct.ag \106 arch/$(KARCH)/include/arch/context_struct.ag \107 arch/$(KARCH)/include/arch/boot/memmap_struct.ag 105 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 106 arch/$(KARCH)/include/arch/context_struct.ag.h \ 107 arch/$(KARCH)/include/arch/boot/memmap_struct.ag.h 108 108 -
kernel/arch/ia32/include/arch/boot/memmap.h
rfd57cf17 r0aa06cbe 36 36 #define KERN_ia32_MEMMAP_H_ 37 37 38 #include <arch/boot/memmap_struct.h> 38 39 39 40 40 /* E820h memory range types */ … … 61 61 #define MEMMAP_E820_MAX_RECORDS 32 62 62 63 #ifndef __ASM__ 63 #ifdef __ASM__ 64 65 #include <arch/boot/memmap_struct.ag.h> 66 67 #else 64 68 65 69 #include <stdint.h> 70 #include <arch/boot/memmap_struct.h> 66 71 67 72 extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS]; -
kernel/arch/ia32/src/asm.S
rfd57cf17 r0aa06cbe 35 35 #include <arch/cpu.h> 36 36 #include <arch/mm/page.h> 37 #include <arch/istate_struct. h>37 #include <arch/istate_struct.ag.h> 38 38 #include <arch/smp/apic.h> 39 39 … … 585 585 FUNCTION_END(early_putchar) 586 586 587 -
kernel/arch/ia32/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/ia32/src/smp/ap.S
rfd57cf17 r0aa06cbe 38 38 #include <arch/pm.h> 39 39 #include <arch/cpu.h> 40 #include <arch/context_struct. h>40 #include <arch/context_struct.ag.h> 41 41 42 42 .section K_TEXT_START, "ax" -
kernel/arch/ia64/Makefile.inc
rfd57cf17 r0aa06cbe 73 73 74 74 ARCH_AUTOGENS_AG = \ 75 arch/$(KARCH)/include/arch/istate_struct.ag \76 arch/$(KARCH)/include/arch/context_struct.ag 75 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 76 arch/$(KARCH)/include/arch/context_struct.ag.h 77 77 -
kernel/arch/ia64/include/arch/interrupt.h
rfd57cf17 r0aa06cbe 37 37 38 38 #ifndef __ASM__ 39 #include <_bits/native.h> 39 40 #include <arch/istate.h> 40 41 #include <stdint.h> -
kernel/arch/ia64/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 32 32 .text -
kernel/arch/ia64/src/ivt.S
rfd57cf17 r0aa06cbe 33 33 #include <arch/mm/page.h> 34 34 #include <arch/interrupt.h> 35 #include <arch/istate_struct. h>35 #include <arch/istate_struct.ag.h> 36 36 #include <align.h> 37 37 -
kernel/arch/mips32/Makefile.inc
rfd57cf17 r0aa06cbe 89 89 90 90 ARCH_AUTOGENS_AG = \ 91 arch/$(KARCH)/include/arch/istate_struct.ag \92 arch/$(KARCH)/include/arch/context_struct.ag \93 arch/$(KARCH)/include/arch/fpu_context_struct.ag 91 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 92 arch/$(KARCH)/include/arch/context_struct.ag.h \ 93 arch/$(KARCH)/include/arch/fpu_context_struct.ag.h -
kernel/arch/ppc32/Makefile.inc
rfd57cf17 r0aa06cbe 60 60 61 61 ARCH_AUTOGENS_AG = \ 62 arch/$(KARCH)/include/arch/istate_struct.ag \63 arch/$(KARCH)/include/arch/context_struct.ag \64 arch/$(KARCH)/include/arch/fpu_context_struct.ag 62 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 63 arch/$(KARCH)/include/arch/context_struct.ag.h \ 64 arch/$(KARCH)/include/arch/fpu_context_struct.ag.h 65 65 -
kernel/arch/riscv64/Makefile.inc
rfd57cf17 r0aa06cbe 55 55 56 56 ARCH_AUTOGENS_AG = \ 57 arch/$(KARCH)/include/arch/istate_struct.ag \58 arch/$(KARCH)/include/arch/context_struct.ag 57 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 58 arch/$(KARCH)/include/arch/context_struct.ag.h -
kernel/arch/sparc64/Makefile.inc
rfd57cf17 r0aa06cbe 111 111 112 112 ARCH_AUTOGENS_AG = \ 113 arch/$(KARCH)/include/arch/istate_struct.ag \114 arch/$(KARCH)/include/arch/context_struct.ag 113 arch/$(KARCH)/include/arch/istate_struct.ag.h \ 114 arch/$(KARCH)/include/arch/context_struct.ag.h 115 115
Note:
See TracChangeset
for help on using the changeset viewer.
