Changes in kernel/generic/src/mm/slab.c [ab6f2507:7a0359b] in mainline

File:

• kernel/generic/src/mm/slab.c (modified) (4 diffs)

kernel/generic/src/mm/slab.c

@@ -612 +612 @@
         cache->name = name;
         
-        if (align < sizeof(sysarg_t))
-                align = sizeof(sysarg_t);
+        if (align < sizeof(unative_t))
+                align = sizeof(unative_t);
         
         size = ALIGN_UP(size, align);
@@ -806 +806 @@
 }
 
-/** Go through all caches and reclaim what is possible */
+/** Go through all caches and reclaim what is possible
+ *
+ * Interrupts must be disabled before calling this function,
+ * otherwise  memory allocation from interrupts can deadlock.
+ *
+ */
 size_t slab_reclaim(unsigned int flags)
 {
-        irq_spinlock_lock(&slab_cache_lock, true);
+        irq_spinlock_lock(&slab_cache_lock, false);
         
         size_t frames = 0;
@@ -819 +824 @@
         }
         
-        irq_spinlock_unlock(&slab_cache_lock, true);
+        irq_spinlock_unlock(&slab_cache_lock, false);
         
         return frames;
@@ -885 +890 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
+                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,