From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22B93C00A89 for ; Mon, 2 Nov 2020 10:23:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1968222E8 for ; Mon, 2 Nov 2020 10:23:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kl2vfjVF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728442AbgKBKXo (ORCPT ); Mon, 2 Nov 2020 05:23:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41512 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728005AbgKBKXo (ORCPT ); Mon, 2 Nov 2020 05:23:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604312622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Wp9LWIdQQeaVWYBrapN4RJch0BVmepD/23UqIg4kz2Q=; b=Kl2vfjVFoXvTlsK3Xx57pHqVNA6um6BJYdoh4KA2sT+dErzxpzaRbFZWGhIT0ZARaDrxEx /pClIzpTvmI9yJd2KqrAX2GrTy/fwdgI5K02mXPg/NVCpvdNK2A7wAqeOjDcf/YEufF9jC T/RazfGcdsxUEW8C9sBouJRs1P5WjnQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-6iKsuRHHNG2LvB_wUHNf2Q-1; Mon, 02 Nov 2020 05:23:40 -0500 X-MC-Unique: 6iKsuRHHNG2LvB_wUHNf2Q-1 Received: by mail-wr1-f70.google.com with SMTP id b6so6202658wrn.17 for ; Mon, 02 Nov 2020 02:23:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Wp9LWIdQQeaVWYBrapN4RJch0BVmepD/23UqIg4kz2Q=; b=PKhViLS3V3EIyyxomYPnQCm5wOVwOepeWXeNyvi/O3IEIBo53RKX0zsuh1sz+wM6PF blFEfv2s4tW/qxNIXoQQtug1w1gO+Mo8U0JLxYP75hZnYnOSddHJlpRYCBQbL4I9BJXB H5/d63fmg6Sfst8ZcuLgKgBQL2XlbtnztROh1KUK7ZQmCdac8bZG4UDFn1DQDhzpaFc9 uV4dU4IvhFQ+itAXlKgVeIZZojobYbAi5tKSSwf9t9PylkqU6ZMxCKSeXyx+Z6BxGarJ QGfBcqljkY0ehXFc0diJ2p2huc3/IrLU2xSmwmGmWwA42Fm4khVdOKK2yIQKQ49CBHlx UsGw== X-Gm-Message-State: AOAM533sxvsfzA3Nycdukq1WiWpeE662lft4eLAp/D8/RML1SK38zrN4 3ueE03tOwidb+yQ1NiTtFnT4A+MCRaGX1CiLYV7gPvHPvb1DdVXpqjdG7+rirNGJ49i8y0scxug BRusvGrKsa8wpOdeI06inrNm7 X-Received: by 2002:a05:6000:18f:: with SMTP id p15mr12460072wrx.185.1604312618487; Mon, 02 Nov 2020 02:23:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJznFGNmmLYGwZJwr0mGaJjbUUa+GHkURX7Blm6FFeB1v9AnrgQ4pPjIhkgBVh1ilzBqxxD+OQ== X-Received: by 2002:a05:6000:18f:: with SMTP id p15mr12460054wrx.185.1604312618293; Mon, 02 Nov 2020 02:23:38 -0800 (PST) Received: from redhat.com (bzq-79-182-97-190.red.bezeqint.net. [79.182.97.190]) by smtp.gmail.com with ESMTPSA id z15sm20847366wrq.24.2020.11.02.02.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 02:23:37 -0800 (PST) Date: Mon, 2 Nov 2020 05:23:28 -0500 From: "Michael S. Tsirkin" To: Daniel Vetter Cc: Stephen Rothwell , Christoph Hellwig , Intel Graphics , DRI , Christian =?iso-8859-1?Q?K=F6nig?= , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20201102052254-mutt-send-email-mst@kernel.org> References: <20201102124327.2f82b2a7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote: > On Mon, Nov 2, 2020 at 2:43 AM 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 ''; did you forget to '#include '? > > 6 | #include > > +++ |+#include > > 7 | #include > > 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 > > 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 > > I think simplest if this lands through dma-api tree into current -rc > kernels. Or should we just put this into drm-misc-next since that's > where the problem shows up? Christoph, any preference from dma-api > side? > -Daniel Or I can merge it since I merged the original patch causing the issue ... > > --- > > 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 > > #include > > #include > > +#ifndef CONFIG_SWIOTLB > > +#include > > +#endif > > > > struct device; > > struct page; > > -- > > 2.28.0 > > > > -- > > Cheers, > > Stephen Rothwell > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch