diff --git a/[refs] b/[refs] index cb4d232335fb..b70dc66a51f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bee0393cc12b6d8f10e884e555a095e050e0b2b9 +refs/heads/master: c304a51bf42a7ce48f430a371e1213472c89e13d diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 3c95c4d6e31a..ee0e5cafa859 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -549,7 +549,7 @@ void blk_exit_rl(struct request_list *rl) struct request_queue *blk_alloc_queue(gfp_t gfp_mask) { - return blk_alloc_queue_node(gfp_mask, -1); + return blk_alloc_queue_node(gfp_mask, NUMA_NO_NODE); } EXPORT_SYMBOL(blk_alloc_queue); @@ -660,7 +660,7 @@ EXPORT_SYMBOL(blk_alloc_queue_node); struct request_queue *blk_init_queue(request_fn_proc *rfn, spinlock_t *lock) { - return blk_init_queue_node(rfn, lock, -1); + return blk_init_queue_node(rfn, lock, NUMA_NO_NODE); } EXPORT_SYMBOL(blk_init_queue); diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 6cace663a80e..2a6fdf539a69 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -1245,7 +1245,7 @@ EXPORT_SYMBOL(blk_lookup_devt); struct gendisk *alloc_disk(int minors) { - return alloc_disk_node(minors, -1); + return alloc_disk_node(minors, NUMA_NO_NODE); } EXPORT_SYMBOL(alloc_disk);