On Thu, 11 Apr 2019 18:36:48 +0200 Cornelia Huck <cohuck@xxxxxxxxxx> wrote: > On Thu, 11 Apr 2019 12:25:38 -0400 > Eric Farman <farman@xxxxxxxxxxxxx> wrote: > > > On 4/11/19 11:58 AM, Halil Pasic wrote: > > > On Wed, 10 Apr 2019 22:59:41 -0400 > > > Eric Farman <farman@xxxxxxxxxxxxx> wrote: > > > > > >> r the next release :) It would be one thing less on my plate... > > >>>> > > >>> > > >>> Sorry I was not able to spend any significant amount of time on this > > >>> lately. > > >>> > > >>> Gave the combined set (this + Farhans fio-ccw fixes for kernel > > >>> stacktraces v2) it a bit of smoke testing after some minor adjustments > > >>> to make it compile: > > >>> > > >>> --- a/drivers/s390/cio/vfio_ccw_ops.c > > >>> +++ b/drivers/s390/cio/vfio_ccw_ops.c > > >>> @@ -13,6 +13,7 @@ > > >>> #include <linux/vfio.h> > > >>> #include <linux/mdev.h> > > >>> #include <linux/nospec.h> > > >>> +#include <linux/slab.h> > > >>> > > >>> #include "vfio_ccw_private.h" > > >>> > > >>> > > >> > > >> Hrm... Taking today's master, and the two series you mention (slight > > >> adjustment to apply patch 3 of Connie's series, because part of it was > > >> split out a few weeks ago), and I don't encounter this. Tried switching > > >> between SLUB/SLAB, but still compiles fine. > > > > > > Let me guess: you have CONFIG_PCI in our .config, right? > > > > > > In arch/s390/include/asm/pci_io.h we have > > > > > > #ifndef _ASM_S390_PCI_IO_H > > > #define _ASM_S390_PCI_IO_H > > > > > > #ifdef CONFIG_PCI > > > > > > #include <linux/kernel.h> > > > #include <linux/slab.h> > > > > > > and pci_io.h comes in via > > > > > > include/linux/vfio.h > > > include/linux/iommu.h > > > include/linux/scatterlist.h > > > arch/s390/include/asm/io.h > > > arch/s390/include/asm/pci_io.h > > > > > > > > > Figured it out with help from Farhan. Took me quite some time. > > > > That would have been useful information up front. > > Indeed. It's trivial to fold that change in, though :) (Should be in > patch 4, if I see it correctly.) > #4 vfio-ccw: add capabilities chain it is! Cheers, Halil
