| Message ID | 20211014050606.7288-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3d708925fcca1a2f7219bc9ce93e6341f85c1e0 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: tulip: winbond-840: fix build for UML | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 13 Oct 2021 22:06:06 -0700 you wrote: > On i386, when builtin (not a loadable module), the winbond-840 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: > > [...] Here is the summary with links: - [net-next] net: tulip: winbond-840: fix build for UML https://git.kernel.org/netdev/net-next/c/a3d708925fcc You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
--- linux-next-20211013.orig/drivers/net/ethernet/dec/tulip/winbond-840.c +++ linux-next-20211013/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -877,7 +877,7 @@ static void init_registers(struct net_de 8000 16 longwords 0200 2 longwords 2000 32 longwords C000 32 longwords 0400 4 longwords */ -#if defined (__i386__) && !defined(MODULE) +#if defined (__i386__) && !defined(MODULE) && !defined(CONFIG_UML) /* When not a module we can work around broken '486 PCI boards. */ if (boot_cpu_data.x86 <= 4) { i |= 0x4800;
On i386, when builtin (not a loadable module), the winbond-840 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/dec/tulip/winbond-840.c: In function ‘init_registers’: ../drivers/net/ethernet/dec/tulip/winbond-840.c:882:19: error: ‘struct cpuinfo_um’ has no member named ‘x86’ if (boot_cpu_data.x86 <= 4) { 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> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: linux-parisc@vger.kernel.org --- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)