diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-08 16:22:17 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-08 12:14:25 -0700 |
| commit | d1ea7be5f755bf1a4d4fdccc35880fcf5069df60 (patch) | |
| tree | aa06c059759e456ffa29b766a346cac48e3acf82 /drivers/nvme | |
| parent | ac02dddec63385ffef1397d3f56cec4108bcafe9 (diff) | |
| download | linux-stable-d1ea7be5f755bf1a4d4fdccc35880fcf5069df60.tar.gz linux-stable-d1ea7be5f755bf1a4d4fdccc35880fcf5069df60.tar.bz2 linux-stable-d1ea7be5f755bf1a4d4fdccc35880fcf5069df60.zip | |
nvme: fix another 32-bit build warning
The nvme_user_cmd function was recently moved around from one file
to another, which made a warning reappear that I had fixed before
at some point:
drivers/nvme/host/core.c: In function 'nvme_user_cmd':
drivers/nvme/host/core.c:424:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
This applies the same workaround that we have elsewhere in the
driver with an extra type cast to uintptr_t.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 1673f1f08c88 ("nvme: move block_device_operations and ns/ctrl freeing to common code")
Link: https://lkml.org/lkml/2015/10/9/611
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index f9c4e80c2441..47ebfb85b14b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -421,7 +421,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, timeout = msecs_to_jiffies(cmd.timeout_ms); status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c, - (void __user *)cmd.addr, cmd.data_len, + (void __user *)(uintptr_t)cmd.addr, cmd.data_len, &cmd.result, timeout); if (status >= 0) { if (put_user(cmd.result, &ucmd->result)) |