On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26: > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size': > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function) > 99 | return SIZE_MAX; > | ^~~~~~~~ > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'? > 6 | #include <linux/init.h> > +++ |+#include <stdint.h> > 7 | #include <linux/types.h> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in > 99 | return SIZE_MAX; > | ^~~~~~~~ > > Caused by commit > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") > > but only exposed by commit > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include") > > I applied the following fix for today: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Mon, 2 Nov 2020 12:34:57 +1100 > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx> I guess it makes sense to pick this up for this release directly. I'll merge this unless there are any objections. > --- > include/linux/swiotlb.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h > index 513913ff7486..ed9de7855d3b 100644 > --- a/include/linux/swiotlb.h > +++ b/include/linux/swiotlb.h > @@ -5,6 +5,9 @@ > #include <linux/dma-direction.h> > #include <linux/init.h> > #include <linux/types.h> > +#ifndef CONFIG_SWIOTLB > +#include <linux/limits.h> > +#endif > > struct device; > struct page; > -- > 2.28.0 > > -- > Cheers, > Stephen Rothwell