lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 429/917] net: fealnx: fix build for UML
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit cd2621d07d517473611b170c69beb6524c677740 ]

    On i386, when builtin (not a loadable module), the fealnx driver
    inspects boot_cpu_data to see what CPU family it is running on, and
    then acts on that data. The "family" struct member (x86) does not exist
    when running on UML, so prevent that test and do the default action.

    Prevents this build error on UML + i386:

    ../drivers/net/ethernet/fealnx.c: In function ‘netdev_open’:
    ../drivers/net/ethernet/fealnx.c:861:19: error: ‘struct cpuinfo_um’ has no member named ‘x86’

    Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: linux-um@lists.infradead.org
    Cc: Jeff Dike <jdike@addtoit.com>
    Cc: Richard Weinberger <richard@nod.at>
    Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
    Link: https://lore.kernel.org/r/20211014050500.5620-1-rdunlap@infradead.org
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/fealnx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
    index 25c91b3c5fd30..819266d463b07 100644
    --- a/drivers/net/ethernet/fealnx.c
    +++ b/drivers/net/ethernet/fealnx.c
    @@ -857,7 +857,7 @@ static int netdev_open(struct net_device *dev)
    np->bcrvalue |= 0x04; /* big-endian */
    #endif

    -#if defined(__i386__) && !defined(MODULE)
    +#if defined(__i386__) && !defined(MODULE) && !defined(CONFIG_UML)
    if (boot_cpu_data.x86 <= 4)
    np->crvalue = 0xa00;
    else
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:39    [W:3.612 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site