Changeset 8b36bf2 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/src/sysinfo/sysinfo.c (modified) (1 diff)

kernel/generic/src/sysinfo/sysinfo.c

@@ -97 +97 @@
 void sysinfo_init(void)
 {
-        sysinfo_item_slab = slab_cache_create("sysinfo_item_slab",
+        sysinfo_item_slab = slab_cache_create("sysinfo_item_t",
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);