Changeset 7715994 in mainline for kernel/test/mm/slab2.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/test/mm/slab2.c (modified) (1 diff)

kernel/test/mm/slab2.c

@@ -226 +226 @@
 }
 
-char *test_slab2(void)
+const char *test_slab2(void)
 {
         TPRINTF("Running reclaim single-thread test .. pass 1\n");