From: Randy Dunlap Date: Thu, 14 Oct 2021 05:05:00 +0000 (-0700) Subject: net: fealnx: fix build for UML X-Git-Tag: v6.1-rc5~2768^2~194 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd2621d07d517473611b170c69beb6524c677740;p=platform%2Fkernel%2Flinux-starfive.git net: fealnx: fix build for UML 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 Cc: linux-um@lists.infradead.org Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Link: https://lore.kernel.org/r/20211014050500.5620-1-rdunlap@infradead.org Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index 63c935e..ab194c9 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