X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=block%2Fdeadline-iosched.c;h=87ca02ac84cb1d5a6f77f5377c6ec8f4e7492d55;hb=5c4c1489b93c9dc51cc6e97fd73e325ce94983c0;hp=b7c5b34cb7b43b4688b3f4bbda5951726bbb008a;hpb=8a84fc15ae5cafcc366dd85cf8e1ab2040679abc;p=powerpc.git

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index b7c5b34cb7..87ca02ac84 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -356,14 +356,13 @@ static void deadline_exit_queue(elevator_t *e)
 /*
  * initialize elevator private data (deadline_data).
  */
-static void *deadline_init_queue(request_queue_t *q, elevator_t *e)
+static void *deadline_init_queue(request_queue_t *q)
 {
 	struct deadline_data *dd;
 
-	dd = kmalloc_node(sizeof(*dd), GFP_KERNEL, q->node);
+	dd = kmalloc_node(sizeof(*dd), GFP_KERNEL | __GFP_ZERO, q->node);
 	if (!dd)
 		return NULL;
-	memset(dd, 0, sizeof(*dd));
 
 	INIT_LIST_HEAD(&dd->fifo_list[READ]);
 	INIT_LIST_HEAD(&dd->fifo_list[WRITE]);