Changeset 32573ff in mainline for kernel/arch/amd64/Makefile.inc

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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.

Message:

Merge mainline, which has dltest and fixes.

File:

• kernel/arch/amd64/Makefile.inc (modified) (2 diffs)

kernel/arch/amd64/Makefile.inc

@@ -57 +57 @@
         arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/pm.c \
+        arch/$(KARCH)/src/vreg.c \
+        arch/$(KARCH)/src/kseg.c \
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/ddi/ddi.c \
@@ -90 +92 @@
 ARCH_AUTOGENS_AG = \
         arch/$(KARCH)/include/arch/istate_struct.ag \
-        arch/$(KARCH)/include/arch/context_struct.ag
+        arch/$(KARCH)/include/arch/context_struct.ag \
+        arch/$(KARCH)/include/arch/kseg_struct.ag