From f8dd06ab315f9bb5320836988f09dba0a7ff16f8 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 2 Mar 2008 23:28:24 +0300
Subject: [PATCH] --- yaml --- r: 86687 b: refs/heads/master c:
 62e5c4b4d6351707346695fd9e151b6cda85cbe1 h: refs/heads/master i:   86685:
 aa727818209cb26f0cab7894df1b4a4c4105c985   86683:
 3803c98a86e14294c0e8888cb42d7745fdde7c53   86679:
 671d16fbbd9ed66b34e8d908d5d0713c06815b52   86671:
 9e9cf737268cbdfd99135cd893e3b8358907ad1b   86655:
 97324de9f155264ee287d908bbb75102ac4001c5 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 021e9bddebf9..f21b5cf9782f 100644
--- 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
index ecacacdce9d7..0863fd38a5ce 100644
--- 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) {