Merge tag 'v3.12'

Linux 3.12

1 files changed, 1 insertions, 1 deletions

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 20614a332362..9ef66406c625 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -346,7 +346,7 @@ static int deadline_init_queue(struct request_queue *q, struct elevator_type *e)
         if (!eq)
                 return -ENOMEM;
 
-        dd = kmalloc_node(sizeof(*dd), GFP_KERNEL | __GFP_ZERO, q->node);
+        dd = kzalloc_node(sizeof(*dd), GFP_KERNEL, q->node);
         if (!dd) {
                 kobject_put(&eq->kobj);
                 return -ENOMEM;