From patchwork Mon Dec 9 22:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11280541 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 232B4138D for ; Mon, 9 Dec 2019 22:40:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B67C206E0 for ; Mon, 9 Dec 2019 22:40:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B67C206E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 484856E57E; Mon, 9 Dec 2019 22:40:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1047F6E57E for ; Mon, 9 Dec 2019 22:40:17 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47WynQ44pkz9sP3; Tue, 10 Dec 2019 09:40:09 +1100 (AEDT) Date: Tue, 10 Dec 2019 09:39:57 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Message-ID: <20191210093957.5120f717@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1575931211; bh=xaSCsYIoLdbzF/sfZe8codPTTC7A2ZfwROYPO4I7q5A=; h=Date:From:To:Cc:Subject:From; b=Jv1OIDoTtqvkK0ol86sbY30Po7yJ8IEWSa5/4vEou4tBOlNtlWGBTzD7Ej2zEk8Eq 0lzcaWeCGNBWLpmDD4HyPpkEt1B4CxWZZ+fGYeXeGXdKLr5tvzVs1yJWOwComVOjJu /zKpr0H+KgQTrtAM724vgNg/R4Vy3RY3aQAQ8iEhtjBQMsL9Gl+MiYgTzC8HGgtEUN 2qF+3upaiaDuRKpDVrg6YlEFonT0kGGeLi2QIKnK1h9o82bVAob7ryptqNstNMTwa0 BN3YL9zkvXi2uUOObBdwu7ecQkEMV7wl2DteSpb2Y+Zw6VyT6TNLlFJYt/AWexxgFp VPShxC0RPZ1pA== Subject: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Kernel Mailing List , S@freedesktop.org, Linux Next Mailing List , Qian Cai , Ingo Molnar Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/spinlock_types.h:18, from include/linux/mutex.h:16, from include/linux/kernfs.h:12, from include/linux/sysfs.h:16, from include/linux/kobject.h:20, from include/linux/of.h:17, from include/linux/irqdomain.h:35, from include/linux/acpi.h:13, from drivers/gpu/drm/i915/i915_drv.c:30: drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages': include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release' 635 | lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ | ^~~~~~~~~~~~ drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested' 294 | might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES); | ^~~~~~~~~~~~~~~~~ include/linux/lockdep.h:352:13: note: declared here 352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip); | ^~~~~~~~~~~~ In file included from include/linux/spinlock_types.h:18, from include/linux/spinlock.h:83, from include/linux/mmzone.h:8, from include/linux/gfp.h:6, from include/linux/slab.h:15, from drivers/gpu/drm/i915/i915_irq.c:32: drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages': include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release' 635 | lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ | ^~~~~~~~~~~~ drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested' 294 | might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES); | ^~~~~~~~~~~~~~~~~ include/linux/lockdep.h:352:13: note: declared here 352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip); | ^~~~~~~~~~~~ Caused by commit e692b4021a2e ("lockdep: add might_lock_nested()") interacting with commit 5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()") from Linus' tree. I have applied the following merge fix patch for today: From: Stephen Rothwell Date: Tue, 10 Dec 2019 09:37:07 +1100 Subject: [PATCH] lockdep: fix up for lock_release API change --- include/linux/lockdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 5bbfd5866081..664f52c6dd4c 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -632,7 +632,7 @@ do { \ typecheck(struct lockdep_map *, &(lock)->dep_map); \ lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL, \ _THIS_IP_); \ - lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ + lock_release(&(lock)->dep_map, _THIS_IP_); \ } while (0) #define lockdep_assert_irqs_enabled() do { \