Changeset 357b5f5 in mainline for kernel/generic/src/mm

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (1 diff)
• slab.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -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);
 }
 

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);
@@ -806 +806 @@
 }
 
-/** Go through all caches and reclaim what is possible
- *
- * Interrupts must be disabled before calling this function,
- * otherwise  memory allocation from interrupts can deadlock.
- *
- */
+/** Go through all caches and reclaim what is possible */
 size_t slab_reclaim(unsigned int flags)
 {
-        irq_spinlock_lock(&slab_cache_lock, false);
+        irq_spinlock_lock(&slab_cache_lock, true);
         
         size_t frames = 0;
@@ -824 +819 @@
         }
         
-        irq_spinlock_unlock(&slab_cache_lock, false);
+        irq_spinlock_unlock(&slab_cache_lock, true);
         
         return frames;