---

yaml --- r: 86687 b: refs/heads/master c: 62e5c4b h: refs/heads/master i: 86685: aa72781 86683: 3803c98 86679: 671d16f 86671: 9e9cf73 86655: 97324de v: v3
git-mirror · Mar 3, 2008 · f8dd06a · f8dd06a
1 parent ed34739
commit f8dd06a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f619cfe1bda809a97c407f4c723eb3235ecd64e5
+refs/heads/master: 62e5c4b4d6351707346695fd9e151b6cda85cbe1
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -3564,8 +3564,8 @@ enum slab_stat_type {
 #define SO_CPU		(1 << SL_CPU)
 #define SO_OBJECTS	(1 << SL_OBJECTS)
 
-static unsigned long show_slab_objects(struct kmem_cache *s,
-			char *buf, unsigned long flags)
+static ssize_t show_slab_objects(struct kmem_cache *s,
+			    char *buf, unsigned long flags)
 {
 	unsigned long total = 0;
 	int cpu;
@@ -3575,6 +3575,8 @@ static unsigned long show_slab_objects(struct kmem_cache *s,
 	unsigned long *per_cpu;
 
 	nodes = kzalloc(2 * sizeof(unsigned long) * nr_node_ids, GFP_KERNEL);
+	if (!nodes)
+		return -ENOMEM;
 	per_cpu = nodes + nr_node_ids;
 
 	for_each_possible_cpu(cpu) {