Changeset 475dc3e in mainline

Timestamp:

2012-02-19T09:48:20Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1ebb66f

Parents:

a7d6185 (diff), ec8c622 (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 with mainline

Files:

• kernel/arch/ia64/src/ia64.c (modified) (1 diff)
• kernel/generic/src/mm/page.c (modified) (2 diffs)
• uspace/lib/c/arch/ia64/include/ddi.h (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -144 +144 @@
 #endif
 #ifdef MACHINE_i460GX
-        platform = "i460GX";
+        platform = "pc";
 #endif
         sysinfo_set_item_data("platform", NULL, (void *) platform,

kernel/generic/src/mm/page.c

@@ -168 +168 @@
 int page_find_mapping(uintptr_t virt, void **phys)
 {
-        mutex_lock(&AS->lock);
+        page_table_lock(AS, true);
         
         pte_t *pte = page_mapping_find(AS, virt, false);
         if ((!PTE_VALID(pte)) || (!PTE_PRESENT(pte))) {
-                mutex_unlock(&AS->lock);
+                page_table_unlock(AS, true);
                 return ENOENT;
         }
@@ -179 +179 @@
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));
         
-        mutex_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         
         return EOK;

uspace/lib/c/arch/ia64/include/ddi.h

@@ -134 +134 @@
         asm volatile ("mf\n" ::: "memory");
 
-        if (port < (ioport32_t *) port) {
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 uintptr_t prt = (uintptr_t) port;