Changeset 82d56184 in mainline for kernel/test/mm/mapping1.c

Timestamp:

2011-06-01T21:05:19Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cac9cd

Parents:

682cfceb (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.

File:

• kernel/test/mm/mapping1.c (modified) (3 diffs)

kernel/test/mm/mapping1.c

@@ -35 +35 @@
 #include <typedefs.h>
 #include <debug.h>
+#include <arch.h>
 
 #define PAGE0  0x10000000
@@ -58 +59 @@
         *((uint32_t *) frame1) = VALUE1;
         
+        page_table_lock(AS, true);
+
         TPRINTF("Mapping virtual address %p to physical address %p.\n",
             (void *) PAGE0, (void *) KA2PA(frame0));
@@ -65 +68 @@
             (void *) PAGE1, (void *) KA2PA(frame1));
         page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
+
+        page_table_unlock(AS, true);
         
         v0 = *((uint32_t *) PAGE0);