D45750.id.diff
No OneTemporary
Actions

Size

831 B

Referenced Files

None

Subscribers

None

D45750.id.diff
View Options

	diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
	--- a/sys/dev/nvme/nvme_ctrlr.c
	+++ b/sys/dev/nvme/nvme_ctrlr.c
	@@ -1363,14 +1363,16 @@
	PHOLD(curproc);
	buf = uma_zalloc(pbuf_zone, M_WAITOK);
	buf->b_iocmd = npc->opcode & 1 ? BIO_WRITE : BIO_READ;
	- if (vmapbuf(buf, (void *)npc->addr, npc->data_len, 1) < 0) {
	+ if (vmapbuf(buf, (void *)(uintptr_t)npc->addr,
	+ npc->data_len, 1) < 0) {
	ret = EFAULT;
	goto err;
	}
	req = nvme_allocate_request_vaddr(buf->b_data, npc->data_len,
	nvme_npc_done, npc);
	} else
	- req = nvme_allocate_request_vaddr((void *)npc->addr, npc->data_len,
	+ req = nvme_allocate_request_vaddr(
	+ (void *)(uintptr_t)npc->addr, npc->data_len,
	nvme_npc_done, npc);
	} else
	req = nvme_allocate_request_null(nvme_npc_done, npc);