Changeset 371bd7d in mainline for kernel/test/mm/mapping1.c

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/mapping1.c (modified) (2 diffs)

kernel/test/mm/mapping1.c

@@ -33 +33 @@
 #include <mm/as.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 
@@ -42 +42 @@
 #define VALUE1  0x89abcdef
 
-char *test_mapping1(void)
+const char *test_mapping1(void)
 {
         uintptr_t frame0, frame1;