From 144c3799135ec76f2fd1933af62c12cdf3c98bba Mon Sep 17 00:00:00 2001
From: "shin, jacob" <jacob.shin@amd.com>
Date: Fri, 28 Apr 2006 10:54:37 -0500
Subject: [PATCH] --- yaml --- r: 26303 b: refs/heads/master c:
 693f7d362055261882659475d2ef022e32edbff1 h: refs/heads/master i:   26301:
 ca101cff2d14e7de8daed7cdb1fcc3732f0da02a   26299:
 dd480c0e3d553c8adc9dd5ddb4750f2da2d4311e   26295:
 ab0bb176d981ade1cb017b1dc16fe27858d36057   26287:
 4b77b4626d9dc1ad0ee3c5671a6075e9cd5a3e25   26271:
 0a78015149e67c9f8c420240c74392f44d096277   26239:
 5489bd0abf6c1a29108096ca39249b597e186c2a v: v3

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

diff --git a/[refs] b/[refs]
index a7206ea88b55..130c1665a272 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4de0b1ee1b630318553248c4cfc78358720a5c84
+refs/heads/master: 693f7d362055261882659475d2ef022e32edbff1
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index af5c5237e11a..c32af7e7581e 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -979,7 +979,8 @@ static void __drain_alien_cache(struct kmem_cache *cachep,
 		 * That way we could avoid the overhead of putting the objects
 		 * into the free lists and getting them back later.
 		 */
-		transfer_objects(rl3->shared, ac, ac->limit);
+		if (rl3->shared)
+			transfer_objects(rl3->shared, ac, ac->limit);
 
 		free_block(cachep, ac->entry, ac->avail, node);
 		ac->avail = 0;