2015-12-08 15:22:54

by Arnd Bergmann

Subject: [PATCH] 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 <[email protected]>
Fixes: 1673f1f08c88 ("nvme: move block_device_operations and ns/ctrl freeing to common code")
Link: https://lkml.org/lkml/2015/10/9/611
---
drivers/nvme/host/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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))
--
2.1.0.rc2

2015-12-08 19:15:53

by Jens Axboe

Subject: Re: [PATCH] nvme: fix another 32-bit build warning

On 12/08/2015 08:22 AM, Arnd Bergmann wrote:
> 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.

Applied to for-4.5/nvme, thanks Arnd.



--
Jens Axboe