Changeset 8436590 in mainline for kernel/Makefile

Timestamp:

2011-04-07T21:38:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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 changes.

File:

• kernel/Makefile (modified) (3 diffs)

kernel/Makefile

@@ -226 +226 @@
         generic/src/proc/task.c \
         generic/src/proc/the.c \
-        generic/src/proc/tasklet.c \
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
@@ -240 +239 @@
         generic/src/lib/func.c \
         generic/src/lib/memstr.c \
+        generic/src/lib/memfnc.c \
         generic/src/lib/sort.c \
         generic/src/lib/str.c \
@@ -381 +381 @@
                 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 \