Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

[cascardo/linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 668394d..2bcbd8c 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -155,7 +155,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
 {
        struct elevator_queue *eq;
 
-       eq = kmalloc_node(sizeof(*eq), GFP_KERNEL | __GFP_ZERO, q->node);
+       eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node);
        if (unlikely(!eq))
                goto err;