On Wed, Nov 30, 2022 at 12:09:45PM -0800, Randy Dunlap wrote: > When building qib_wc_x86_64.c on ARCH=um, references to some cpuinfo > fields cause build errors since cpuinfo does not contain x86-specific > fields. > > Fix the build errors by making this driver depend on !UML. > > Prevents these build errors: > > ../drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function ‘qib_unordered_wc’: > ../drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:29: error: ‘struct cpuinfo_um’ has no member named ‘x86_vendor’ > 149 | return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; > ../drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:44: error: ‘X86_VENDOR_AMD’ undeclared (first use in this function); did you mean ‘X86_VENDOR_ANY’? > 149 | return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; > ../drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:44: note: each undeclared identifier is reported only once for each function it appears in > ../drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] > 150 | } > > Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") > Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Cc: Jason Gunthorpe <jgg@xxxxxxxxxx> > Cc: Leon Romanovsky <leon@xxxxxxxxxx> > Cc: Dennis Dalessandro <dennis.dalessandro@xxxxxxxxxxxxxxxxxxxx> > Cc: linux-rdma@xxxxxxxxxxxxxxx > Cc: Jeff Dike <jdike@xxxxxxxxxxx> > Cc: Richard Weinberger <richard@xxxxxx> > Cc: Anton Ivanov <anton.ivanov@xxxxxxxxxxxxxxxxxx> > Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Cc: linux-um@xxxxxxxxxxxxxxxxxxx > --- > v2: rebase & resend > > drivers/infiniband/hw/qib/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff -- a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig > --- a/drivers/infiniband/hw/qib/Kconfig > +++ b/drivers/infiniband/hw/qib/Kconfig > @@ -3,6 +3,7 @@ config INFINIBAND_QIB > tristate "Intel PCIe HCA support" > depends on 64BIT && INFINIBAND_RDMAVT > depends on PCI > + depends on !UML I would advocate to add this line to whole drivers/infiniband. None of RDMA code makes sense for UML. Thanks > help > This is a low-level driver for Intel PCIe QLE InfiniBand host > channel adapters. This driver does not support the Intel