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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 C5405C00A89 for ; Mon, 2 Nov 2020 09:28:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 369D72225E for ; Mon, 2 Nov 2020 09:28:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ZwDmKsJx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728226AbgKBJ2r (ORCPT ); Mon, 2 Nov 2020 04:28:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727953AbgKBJ2q (ORCPT ); Mon, 2 Nov 2020 04:28:46 -0500 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8B2AC0617A6 for ; Mon, 2 Nov 2020 01:28:46 -0800 (PST) Received: by mail-ot1-x344.google.com with SMTP id g19so2573438otp.13 for ; Mon, 02 Nov 2020 01:28:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IbNuq3s1vVpD8H3QOsjV0sGqJ/Z7oSAbbkfkZvy1XHk=; b=ZwDmKsJx7x9H4A6oxnKV/0mfK5ZFxB3a1aM7tsS3KQVWBTroULG54b+/X/QAb8xkd8 w60J0bsQvWMfAe1GP1j5aHGhevycwGs1eXOS5XmS9e1DzJwaERv34oRwd/zUc5NH25It evwbcfSzmlipcIbMmq2HHokuvcx7O5RLmy0O4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IbNuq3s1vVpD8H3QOsjV0sGqJ/Z7oSAbbkfkZvy1XHk=; b=F4CO12nQgxlMGoUuqlGKFEqSURgoKicX1kTU5+xTIucfi9PPpXg4fjaCCFy44DTumu GhagYE2XsOejWsB7PplNInM+VRFfUf7tbUKVeXhHAc2+C+mV8ndjHGLMw/IAtFL/DCyW jaTTd7aoBzYqoOjwBhpe/V/YM4uyRuCLul0mdbUGyWAk/ZFg10YawTAjcxARbLpP4gKy Ob9aStikEm3ES2X0aLMeKWtOLWu24zjl6UpfsPLYnexDFVzLi0T8Tduo5mtoD01QYSfp Ldomx+lQPZ4zEY/sy4XS9efbuqc9hY3bkog1lGtM1R/bLqq2sQke5nVdWQBn75YOLEA0 NEDQ== X-Gm-Message-State: AOAM531jbeSYqkEfF5TJs4Om8g5M4t9JhwsMRoXyo0fJ9GDcKfpu59zO D018Cj1oI6sf1IiGsBUSxOtJONYQnORv3F8mmmBl/g== X-Google-Smtp-Source: ABdhPJw4HWb5RIkueETRBm8Fwwh31WuQZ8e/6YOS+9xABgykOarqawuOiAF2wFN7DrH/qvVU5QujD60r3ppsBeugVQ4= X-Received: by 2002:a9d:6e81:: with SMTP id a1mr10863311otr.303.1604309326237; Mon, 02 Nov 2020 01:28:46 -0800 (PST) MIME-Version: 1.0 References: <20201102124327.2f82b2a7@canb.auug.org.au> In-Reply-To: <20201102124327.2f82b2a7@canb.auug.org.au> From: Daniel Vetter Date: Mon, 2 Nov 2020 10:28:34 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell , Christoph Hellwig Cc: Intel Graphics , DRI , =?UTF-8?Q?Christian_K=C3=B6nig?= , Joerg Roedel , "Michael S. Tsirkin" , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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