diff options
author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2008-11-19 13:23:59 +0100 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 10:40:51 +0100 |
commit | 89124d706db0aa95daacfa4c0df45a43a44d44f4 (patch) | |
tree | 785cc53484e9645c01ad29a18f9c3fff82c6eced /mm/slub.c | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/p... (diff) | |
download | linux-89124d706db0aa95daacfa4c0df45a43a44d44f4.tar.xz linux-89124d706db0aa95daacfa4c0df45a43a44d44f4.zip |
slub: Add might_sleep_if() to slab_alloc()
Currently SLUB doesn't warn about __GFP_WAIT. Add it into slab_alloc().
Acked-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index a2cd47d89e0a..704cfa34f9ab 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1591,6 +1591,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s, unsigned long flags; unsigned int objsize; + might_sleep_if(gfpflags & __GFP_WAIT); local_irq_save(flags); c = get_cpu_slab(s, smp_processor_id()); objsize = c->objsize; |