From: Christoph Lameter <cl@linux.com>
Date: Tue, 22 Mar 2011 18:32:53 +0000 (-0500)
Subject: slub: Add missing irq restore for the OOM path
X-Git-Tag: upstream/snapshot3+hdmi~11127^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fd66c517d5e98de2528d86e0e62f5069ff99f59;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

slub: Add missing irq restore for the OOM path

OOM path is missing the irq restore in the CONFIG_CMPXCHG_LOCAL case.

Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/mm/slub.c b/mm/slub.c
index 7e4f835..e126cfb 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1857,6 +1857,9 @@ new_slab:
 	}
 	if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
 		slab_out_of_memory(s, gfpflags, node);
+#ifdef CONFIG_CMPXCHG_LOCAL
+	local_irq_restore(flags);
+#endif
 	return NULL;
 debug:
 	if (!alloc_debug_processing(s, c->page, object, addr))