lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 146/211] IB/core: avoid 32-bit warning
    Date
    4.2.8-ckt1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 5d1e623591dfaa64a59ecdac420adc16125524d4 upstream.

    The INIT_UDATA() macro requires a pointer or unsigned long argument for
    both input and output buffer, and all callers had a cast from when
    the code was merged until a recent restructuring, so now we get

    core/uverbs_cmd.c: In function 'ib_uverbs_create_cq':
    core/uverbs_cmd.c:1481:66: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

    This makes the code behave as before by adding back the cast to
    unsigned long.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Fixes: 565197dd8fb1 ("IB/core: Extend ib_uverbs_create_cq")
    Reviewed-by: Yann Droneaud <ydroneaud@opteya.com>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/infiniband/core/uverbs_cmd.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
    index a6ca83b..ba85fca 100644
    --- a/drivers/infiniband/core/uverbs_cmd.c
    +++ b/drivers/infiniband/core/uverbs_cmd.c
    @@ -1463,7 +1463,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
    if (copy_from_user(&cmd, buf, sizeof(cmd)))
    return -EFAULT;

    - INIT_UDATA(&ucore, buf, cmd.response, sizeof(cmd), sizeof(resp));
    + INIT_UDATA(&ucore, buf, (unsigned long)cmd.response, sizeof(cmd), sizeof(resp));

    INIT_UDATA(&uhw, buf + sizeof(cmd),
    (unsigned long)cmd.response + sizeof(resp),
    --
    1.9.1


    \
     
     \ /
      Last update: 2016-01-05 22:01    [W:4.287 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site