Changeset 7bdcc45 in mainline for kernel/generic/src/mm

Timestamp:

2010-12-16T16:38:49Z (15 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.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (5 diffs)
• frame.c (modified) (9 diffs)
• slab.c (modified) (2 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);
                 }

kernel/generic/src/mm/frame.c

@@ -145 +145 @@
                             (!iswithin(zones.info[i].base, zones.info[i].count,
                             base, count))) {
-                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
-                                    PFN2ADDR(base), PFN2ADDR(count),
-                                    PFN2ADDR(zones.info[i].base),
-                                    PFN2ADDR(zones.info[i].count));
+                                printf("Zone (%p, %p) overlaps "
+                                    "with previous zone (%p %p)!\n",
+                                    (void *) PFN2ADDR(base), (void *) PFN2ADDR(count),
+                                    (void *) PFN2ADDR(zones.info[i].base),
+                                    (void *) PFN2ADDR(zones.info[i].count));
                         }
                         
@@ -878 +879 @@
                  * the assert
                  */
-                ASSERT(confframe != NULL);
+                ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL));
                 
                 /* If confframe is supposed to be inside our zone, then make sure
@@ -1049 +1050 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %" PRIs " frames, "
-                    "%" PRIs " available.\n", THREAD->tid, size, avail);
+                printf("Thread %" PRIu64 " waiting for %zu frames, "
+                    "%zu available.\n", THREAD->tid, size, avail);
 #endif
                 
@@ -1104 +1105 @@
          */
         pfn_t pfn = ADDR2PFN(frame);
-        size_t znum = find_zone(pfn, 1, NULL);
+        size_t znum = find_zone(pfn, 1, 0);
         
         ASSERT(znum != (size_t) -1);
@@ -1141 +1142 @@
          * First, find host frame zone for addr.
          */
-        size_t znum = find_zone(pfn, 1, NULL);
+        size_t znum = find_zone(pfn, 1, 0);
         
         ASSERT(znum != (size_t) -1);
@@ -1297 +1298 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-4" PRIs, i);
+                printf("%-4zu", i);
                 
 #ifdef __32_BITS__
-                printf("  %10p", base);
+                printf("  %p", (void *) base);
 #endif
                 
 #ifdef __64_BITS__
-                printf(" %18p", base);
+                printf(" %p", (void *) base);
 #endif
                 
-                printf(" %12" PRIs " %c%c%c      ", count,
+                printf(" %12zu %c%c%c      ", count,
                     available ? 'A' : ' ',
                     (flags & ZONE_RESERVED) ? 'R' : ' ',
@@ -1313 +1314 @@
                 
                 if (available)
-                        printf("%14" PRIs " %14" PRIs,
+                        printf("%14zu %14zu",
                             free_count, busy_count);
                 
@@ -1354 +1355 @@
         bool available = zone_flags_available(flags);
         
-        printf("Zone number:       %" PRIs "\n", znum);
-        printf("Zone base address: %p\n", base);
-        printf("Zone size:         %" PRIs " frames (%" PRIs " KiB)\n", count,
+        printf("Zone number:       %zu\n", znum);
+        printf("Zone base address: %p\n", (void *) base);
+        printf("Zone size:         %zu frames (%zu KiB)\n", count,
             SIZE2KB(FRAMES2SIZE(count)));
         printf("Zone flags:        %c%c%c\n",
@@ -1364 +1365 @@
         
         if (available) {
-                printf("Allocated space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Allocated space:   %zu frames (%zu KiB)\n",
                     busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
-                printf("Available space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                printf("Available space:   %zu frames (%zu KiB)\n",
                     free_count, SIZE2KB(FRAMES2SIZE(free_count)));
         }

kernel/generic/src/mm/slab.c

@@ -612 +612 @@
         cache->name = name;
         
-        if (align < sizeof(unative_t))
-                align = sizeof(unative_t);
+        if (align < sizeof(sysarg_t))
+                align = sizeof(sysarg_t);
         
         size = ALIGN_UP(size, align);
@@ -890 +890 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
+                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,