diff options
| author | Christoph Lameter | 2011-03-22 19:32:53 +0100 |
|---|---|---|
| committer | Pekka Enberg | 2011-03-22 19:48:04 +0100 |
| commit | 2fd66c517d5e98de2528d86e0e62f5069ff99f59 (patch) | |
| tree | 2d8ef9bf8b71872475728f778f0c095ae395785b /mm/slub.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz... (diff) | |
| download | kernel-qcow2-linux-2fd66c517d5e98de2528d86e0e62f5069ff99f59.tar.gz kernel-qcow2-linux-2fd66c517d5e98de2528d86e0e62f5069ff99f59.tar.xz kernel-qcow2-linux-2fd66c517d5e98de2528d86e0e62f5069ff99f59.zip | |
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>
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index 7e4f835e32ab..e126cfbd3df2 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)) |