Changeset 810a36f in mainline for kernel/generic/src/lib/ra.c

Timestamp:

2017-10-24T05:29:08Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

File:

• kernel/generic/src/lib/ra.c (modified) (2 diffs)

kernel/generic/src/lib/ra.c

@@ -353 +353 @@
         link = hash_table_find(&span->used, &key);
         if (!link) {
-                panic("Freeing segment which is not known to be used (base=%"
-                    PRIxn ", size=%" PRIdn ").", base, size);
+                panic("Freeing segment which is not known to be used (base=%zx"
+                    ", size=%zd).", base, size);
         }
         seg = hash_table_get_inst(link, ra_segment_t, uh_link);
@@ -447 +447 @@
         irq_spinlock_unlock(&arena->lock, true);
 
-        panic("Freeing to wrong arena (base=%" PRIxn ", size=%" PRIdn ").",
+        panic("Freeing to wrong arena (base=%" PRIxPTR ", size=%zd).",
             base, size);
 }