Changeset 09b859c in mainline for kernel/Makefile

Timestamp:

2010-07-07T18:37:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77385fe

Parents:

e2ea4ab1 (diff), 22c3444 (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 from mainline.

File:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -365 +365 @@
 
 ifeq ($(CONFIG_TRACE),y)
-INSTRUMENTED_SOURCES = \
-        generic/src/cpu/cpu.c \
-        generic/src/main/main.c \
-        generic/src/main/kinit.c \
-        generic/src/proc/the.c
+        INSTRUMENTED_SOURCES = \
+                generic/src/adt/btree.c \
+                generic/src/cpu/cpu.c \
+                generic/src/ddi/ddi.c \
+                generic/src/interrupt/interrupt.c \
+                generic/src/main/main.c \
+                generic/src/main/kinit.c \
+                generic/src/proc/the.c \
+                generic/src/proc/tasklet.c \
+                generic/src/mm/frame.c \
+                generic/src/mm/page.c \
+                generic/src/mm/tlb.c \
+                generic/src/mm/as.c \
+                generic/src/mm/slab.c \
+                generic/src/sysinfo/sysinfo.c \
+                generic/src/console/kconsole.c
+else
+        INSTRUMENTED_SOURCES =
 endif