Changeset df29f24 in mainline for uspace/app/tester/tester.c

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/tester.c (modified) (1 diff)

uspace/app/tester/tester.c

@@ -63 +63 @@
 #include "mm/malloc1.def"
 #include "mm/malloc2.def"
+#include "mm/malloc3.def"
 #include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
 #include "devs/devman1.def"
+#include "devs/devman2.def"
         {NULL, NULL, NULL, false}
 };