Changeset cf2af94 in mainline for kernel/test/mm/slab1.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• kernel/test/mm/slab1.c (modified) (2 diffs)

kernel/test/mm/slab1.c

@@ -123 +123 @@
 static void slabtest(void *data)
 {
-        int offs = (int) (unative_t) data;
+        int offs = (int) (sysarg_t) data;
         int i, j;
         
@@ -156 +156 @@
         semaphore_initialize(&thr_sem, 0);
         for (i = 0; i < THREADS; i++) {  
-                if (!(t = thread_create(slabtest, (void *) (unative_t) i, TASK, 0, "slabtest", false))) {
+                if (!(t = thread_create(slabtest, (void *) (sysarg_t) i, TASK, 0, "slabtest", false))) {
                         TPRINTF("Could not create thread %d\n", i);
                 } else