Changeset df29f24 in mainline for uspace/app/tester/Makefile

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• uspace/app/tester/Makefile (modified) (1 diff)

uspace/app/tester/Makefile

@@ -48 +48 @@
         ipc/ping_pong.c \
         loop/loop1.c \
+        mm/common.c \
         mm/malloc1.c \
         mm/malloc2.c \
         mm/mapping1.c \
+        mm/malloc3.c \
         devs/devman1.c \
+        devs/devman2.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c