lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 040/258] vbox: fix link error with 'gcc -Og'
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit b8ae30a7020d61e0504529adf45abb08fa5c59f5 ]

    With the new CONFIG_CC_OPTIMIZE_FOR_DEBUGGING option, we get a link
    error in the vboxguest driver, when that fails to optimize out the
    call to the compat handler:

    drivers/virt/vboxguest/vboxguest_core.o: In function `vbg_ioctl_hgcm_call':
    vboxguest_core.c:(.text+0x1f6e): undefined reference to `vbg_hgcm_call32'

    Another compile-time check documents better what we want and avoids
    the error.

    Acked-by: Randy Dunlap <rdunlap@infradead.org>
    Tested-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/virt/vboxguest/vboxguest_core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
    index 3093655c7b92..1475ed5ffcde 100644
    --- a/drivers/virt/vboxguest/vboxguest_core.c
    +++ b/drivers/virt/vboxguest/vboxguest_core.c
    @@ -1312,7 +1312,7 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev,
    return -EINVAL;
    }

    - if (f32bit)
    + if (IS_ENABLED(CONFIG_COMPAT) && f32bit)
    ret = vbg_hgcm_call32(gdev, client_id,
    call->function, call->timeout_ms,
    VBG_IOCTL_HGCM_CALL_PARMS32(call),
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:26    [W:4.196 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site