Changeset cd3b380 in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2013-09-11T11:56:39Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

File:

• kernel/generic/src/mm/slab.c (modified) (1 diff)

kernel/generic/src/mm/slab.c

@@ -182 +182 @@
         size_t zone = 0;
         
-        void *data = (void *)
-            PA2KA(frame_alloc_generic(cache->frames, flags, 0, &zone));
-        if (!data)
+        uintptr_t data_phys =
+            frame_alloc_generic(cache->frames, flags, 0, &zone);
+        if (!data_phys)
                 return NULL;
+        
+        void *data = (void *) PA2KA(data_phys);
         
         slab_t *slab;