Merge tag 'tty-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-block.git] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index 47a659dedd44405a277190d3bf9b1655636573d5..1c0294858527367442c4c3f142e2972451352c5d 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -312,7 +312,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask)
 {
        void *element;
        unsigned long flags;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        gfp_t gfp_temp;
 
        VM_WARN_ON_ONCE(gfp_mask & __GFP_ZERO);