diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-12 23:57:49 -0700 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-17 11:14:17 -0700 |
| commit | caeab084deb61cd2d51cb8facc0e894a5b406aa4 (patch) | |
| tree | 9a5bebe51b0dce51169bf86c6a0fb91d0c929c56 | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
| download | blackbird-op-linux-caeab084deb61cd2d51cb8facc0e894a5b406aa4.tar.gz blackbird-op-linux-caeab084deb61cd2d51cb8facc0e894a5b406aa4.zip | |
slub page alloc fallback: Enable interrupts for GFP_WAIT.
The fallback path needs to enable interrupts like done for
the other page allocator calls. This was not necessary with
the alternate fast path since we handled irq enable/disable in
the slow path. The regular fastpath handles irq enable/disable
around calls to the slow path so we need to restore the proper
status before calling the page allocator from the slowpath.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
| -rw-r--r-- | mm/slub.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c index 96d63eb3ab17..ca71d5b81e4a 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -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)) |
