X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=block%2Fnoop-iosched.c;h=1c3de2b9a6b59c0d6938b082bfb48fa6085d877d;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=f370e4a7fe6d7a26e66f988774c002af6b772725;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index f370e4a7f..1c3de2b9a 100644
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -65,16 +65,15 @@ noop_latter_request(request_queue_t *q, struct request *rq)
 	return list_entry(rq->queuelist.next, struct request, queuelist);
 }
 
-static int noop_init_queue(request_queue_t *q, elevator_t *e)
+static void *noop_init_queue(request_queue_t *q)
 {
 	struct noop_data *nd;
 
-	nd = kmalloc(sizeof(*nd), GFP_KERNEL);
+	nd = kmalloc_node(sizeof(*nd), GFP_KERNEL, q->node);
 	if (!nd)
-		return -ENOMEM;
+		return NULL;
 	INIT_LIST_HEAD(&nd->queue);
-	e->elevator_data = nd;
-	return 0;
+	return nd;
 }
 
 static void noop_exit_queue(elevator_t *e)