From patchwork Wed Aug 16 04:47:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9902941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9EBF8600CA for ; Wed, 16 Aug 2017 04:47:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 921C728715 for ; Wed, 16 Aug 2017 04:47:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86B5228961; Wed, 16 Aug 2017 04:47:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 588C928715 for ; Wed, 16 Aug 2017 04:47:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A30A6E043; Wed, 16 Aug 2017 04:47:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32A1F6E01E; Wed, 16 Aug 2017 04:47:05 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3xXGzC4HCWz9s7C; Wed, 16 Aug 2017 14:47:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1502858823; bh=6g/r/muL3jkZ6sdRZVjGIVkC6TwY1gWuW2dn/4CarlM=; h=Date:From:To:Cc:Subject:From; b=n2hnVSa/bLqGJ/royUqAwSgrhQpTynzodg4VPflUE8HDNyQobqURFGd6lBPTzBrds TwgfwAxr8biOeOioUsnAVZ6EGA1S4ieQhu1ayfG7mGS1MLXzVkXl0Cv0Tf1S7f1xY3 Yo+l7e9ZScWoYSRkr32y5Xte565FUSdDU451XpmfKO03agFlOWJI+uU6Sw5WzCNKjc 1JlousOR8J4CcyKrvvfVXX+F8OuomB5M508uTdgZ/Q5GI1J+Auzkj4o/qZqKyrIsTa 3vgpA5j9wzttZ5chzm8ggKZWkAzD2vwXbYpTejN2lVv2z8ZWWfZjzkzsH4KS3ggAL5 OKi3k0Ti9pS6A== Date: Wed, 16 Aug 2017 14:47:03 +1000 From: Stephen Rothwell To: Andrew Morton , Daniel Vetter , Intel Graphics , DRI Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20170816144703.378d4f4d@canb.auug.org.au> MIME-Version: 1.0 Cc: Michal Hocko , Linux Kernel Mailing List , Linux-Next Mailing List , Jason Ekstrand X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the akpm-current tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/i915_gem_execbuffer.c: In function 'get_fence_array': drivers/gpu/drm/i915/i915_gem_execbuffer.c:2163:20: error: 'GFP_TEMPORARY' undeclared (first use in this function) __GFP_NOWARN | GFP_TEMPORARY); ^ Caused by commit 4d6fc0a48c52 ("mm: treewide: remove GFP_TEMPORARY allocation flag") interacting with commit cf6e7bac6357 ("drm/i915: Add support for drm syncobjs") from the drm-intel tree. I applied the following merge fix patch (and I suspect - given the comments in the former commit message - that this could be applied to the drm-intel tree right now without any problems): From: Stephen Rothwell Date: Wed, 16 Aug 2017 14:41:24 +1000 Subject: [PATCH] drm/i915: fix up for mm: treewide: remove GFP_TEMPORARY allocation flag Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 8fbdefe0216e..15ab3e6792f9 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -2160,7 +2160,7 @@ get_fence_array(struct drm_i915_gem_execbuffer2 *args, return ERR_PTR(-EFAULT); fences = kvmalloc_array(args->num_cliprects, sizeof(*fences), - __GFP_NOWARN | GFP_TEMPORARY); + __GFP_NOWARN | GFP_KERNEL); if (!fences) return ERR_PTR(-ENOMEM);