Changeset 544a2e4 in mainline for kernel/test

Timestamp:

2011-05-30T21:37:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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.

Location:

kernel/test

Files:

• fpu/fpu1.def (deleted)
• fpu/fpu1_ia64.c (deleted)
• fpu/fpu1_x86.c (deleted)
• fpu/mips2.c (deleted)
• fpu/mips2.def (deleted)
• fpu/sse1.c (deleted)
• fpu/sse1.def (deleted)
• mm/mapping1.c (modified) (3 diffs)
• test.c (modified) (1 diff)
• test.h (modified) (1 diff)

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);

kernel/test/test.c

@@ -43 +43 @@
 #include <debug/mips1.def>
 #include <fault/fault1.def>
-#include <fpu/fpu1.def>
-#include <fpu/sse1.def>
-#include <fpu/mips2.def>
 #include <mm/falloc1.def>
 #include <mm/falloc2.def>

kernel/test/test.h

@@ -61 +61 @@
 extern const char *test_mips1(void);
 extern const char *test_fault1(void);
-extern const char *test_fpu1(void);
-extern const char *test_sse1(void);
-extern const char *test_mips2(void);
 extern const char *test_falloc1(void);
 extern const char *test_falloc2(void);