Changeset 7bdcc45 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/generic/src/mm/as.c (modified) (5 diffs)

kernel/generic/src/mm/as.c

@@ -312 +312 @@
          *
          */
-        if (overlaps(va, size, NULL, PAGE_SIZE))
+        if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))
                 return false;
         
@@ -1811 +1811 @@
         }
         
-        panic("Inconsistency detected while adding %" PRIs " pages of used "
-            "space at %p.", count, page);
+        panic("Inconsistency detected while adding %zu pages of used "
+            "space at %p.", count, (void *) page);
 }
 
@@ -1991 +1991 @@
         
 error:
-        panic("Inconsistency detected while removing %" PRIs " pages of used "
-            "space from %p.", count, page);
+        panic("Inconsistency detected while removing %zu pages of used "
+            "space from %p.", count, (void *) page);
 }
 
@@ -2000 +2000 @@
 
 /** Wrapper for as_area_create(). */
-unative_t sys_as_area_create(uintptr_t address, size_t size, unsigned int flags)
+sysarg_t sys_as_area_create(uintptr_t address, size_t size, unsigned int flags)
 {
         if (as_area_create(AS, flags | AS_AREA_CACHEABLE, size, address,
             AS_AREA_ATTR_NONE, &anon_backend, NULL))
-                return (unative_t) address;
+                return (sysarg_t) address;
         else
-                return (unative_t) -1;
+                return (sysarg_t) -1;
 }
 
 /** Wrapper for as_area_resize(). */
-unative_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
-{
-        return (unative_t) as_area_resize(AS, address, size, 0);
+sysarg_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
+{
+        return (sysarg_t) as_area_resize(AS, address, size, 0);
 }
 
 /** Wrapper for as_area_change_flags(). */
-unative_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
-{
-        return (unative_t) as_area_change_flags(AS, flags, address);
+sysarg_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
+{
+        return (sysarg_t) as_area_change_flags(AS, flags, address);
 }
 
 /** Wrapper for as_area_destroy(). */
-unative_t sys_as_area_destroy(uintptr_t address)
-{
-        return (unative_t) as_area_destroy(AS, address);
+sysarg_t sys_as_area_destroy(uintptr_t address)
+{
+        return (sysarg_t) as_area_destroy(AS, address);
 }
 
@@ -2105 +2105 @@
                         
                         mutex_lock(&area->lock);
-                        printf("as_area: %p, base=%p, pages=%" PRIs
-                            " (%p - %p)\n", area, area->base, area->pages,
-                            area->base, area->base + FRAMES2SIZE(area->pages));
+                        printf("as_area: %p, base=%p, pages=%zu"
+                            " (%p - %p)\n", area, (void *) area->base,
+                            area->pages, (void *) area->base,
+                            (void *) (area->base + FRAMES2SIZE(area->pages)));
                         mutex_unlock(&area->lock);
                 }