Changeset 132ab5d1 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/mm/as.c (modified) (5 diffs)

kernel/generic/src/mm/as.c

@@ -90 +90 @@
  *
  */
-static slab_cache_t *as_slab;
+static slab_cache_t *as_cache;
 
 /** ASID subsystem lock.
@@ -131 +131 @@
         as_arch_init();
         
-        as_slab = slab_cache_create("as_t", sizeof(as_t), 0,
+        as_cache = slab_cache_create("as_t", sizeof(as_t), 0,
             as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED);
         
@@ -153 +153 @@
 as_t *as_create(unsigned int flags)
 {
-        as_t *as = (as_t *) slab_alloc(as_slab, 0);
+        as_t *as = (as_t *) slab_alloc(as_cache, 0);
         (void) as_create_arch(as, 0);
         
@@ -254 +254 @@
 #endif
         
-        slab_free(as_slab, as);
+        slab_free(as_cache, as);
 }
 
@@ -833 +833 @@
                             btree_node_t, leaf_link);
                         
-                        if ((cond = (bool) node->keys)) {
+                        if ((cond = (node->keys != 0))) {
                                 uintptr_t ptr = node->key[node->keys - 1];
                                 size_t node_size =