Changeset 7715994 in mainline for kernel/generic/include/mm/slab.h

Timestamp:

2010-03-13T12:17:02Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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.

File:

• kernel/generic/include/mm/slab.h (modified) (2 diffs)

kernel/generic/include/mm/slab.h

@@ -86 +86 @@
 
 typedef struct {
-        char *name;
+        const char *name;
         
         link_t link;
@@ -123 +123 @@
 } slab_cache_t;
 
-extern slab_cache_t *slab_cache_create(char *, size_t, size_t,
+extern slab_cache_t *slab_cache_create(const char *, size_t, size_t,
     int (*)(void *, int), int (*)(void *), int);
 extern void slab_cache_destroy(slab_cache_t *);