Changeset 7715994 in mainline for kernel/test/mm/falloc1.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/falloc1.c (modified) (1 diff)

kernel/test/mm/falloc1.c

@@ -41 +41 @@
 #define TEST_RUNS   2
 
-char *test_falloc1(void) {
+const char *test_falloc1(void) {
         uintptr_t *frames
             = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0);