]> git.baikalelectronics.ru Git - kernel.git/commit
net: tulip: winbond-840: fix build for UML
authorRandy Dunlap <rdunlap@infradead.org>
Thu, 14 Oct 2021 05:06:06 +0000 (22:06 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 15 Oct 2021 02:18:53 +0000 (19:18 -0700)
commitf25e362d000f97e1c43d8bc58772335c7825d4ae
treee64522391bb6530daf4d593349c10638b048ecfd
parenta810a9109a06633360f691738f5086e156a8324d
net: tulip: winbond-840: fix build for UML

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: af3397819802 ("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/20211014050606.7288-1-rdunlap@infradead.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/dec/tulip/winbond-840.c