diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-19 04:13:19 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-19 04:13:19 (GMT) |
commit | d5eee405723eedbd621275e045ac9b36f668c39f (patch) | |
tree | 9fca605820972343ba1b13a7e81feda37b7e28be | |
parent | f920bb6f5fe21047e669381fe4dd346f6a9d3562 (diff) | |
parent | caeab084deb61cd2d51cb8facc0e894a5b406aa4 (diff) | |
download | linux-fsl-qoriq-d5eee405723eedbd621275e045ac9b36f668c39f.tar.xz |
Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
slub page alloc fallback: Enable interrupts for GFP_WAIT.
-rw-r--r-- | mm/slub.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1536,9 +1536,15 @@ new_slab: * That is only possible if certain conditions are met that are being * checked when a slab is created. */ - if (!(gfpflags & __GFP_NORETRY) && (s->flags & __PAGE_ALLOC_FALLBACK)) - return kmalloc_large(s->objsize, gfpflags); - + if (!(gfpflags & __GFP_NORETRY) && + (s->flags & __PAGE_ALLOC_FALLBACK)) { + if (gfpflags & __GFP_WAIT) + local_irq_enable(); + object = kmalloc_large(s->objsize, gfpflags); + if (gfpflags & __GFP_WAIT) + local_irq_disable(); + return object; + } return NULL; debug: if (!alloc_debug_processing(s, c->page, object, addr)) |