瀏覽代碼

nvme: Fixes u64 division which breaks i386 builds

Uses div_u64 for u64 division and round_down, a bitwise operation,
instead of rounddown, which uses a modulus.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Jon Derrick 10 年之前
父節點
當前提交
c45f5c9943
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/block/nvme-core.c

+ 3 - 2
drivers/block/nvme-core.c

@@ -1454,8 +1454,9 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues,
 	unsigned q_size_aligned = roundup(q_depth * entry_size, dev->page_size);
 
 	if (q_size_aligned * nr_io_queues > dev->cmb_size) {
-		q_depth = rounddown(dev->cmb_size / nr_io_queues,
-					dev->page_size) / entry_size;
+		u64 mem_per_q = div_u64(dev->cmb_size, nr_io_queues);
+		mem_per_q = round_down(mem_per_q, dev->page_size);
+		q_depth = div_u64(mem_per_q, entry_size);
 
 		/*
 		 * Ensure the reduced q_depth is above some threshold where it