From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, S@freedesktop.org, Linux Next Mailing List <linux-next@vger.kernel.org>, Qian Cai <cai@lca.pw>, Ingo Molnar <mingo@kernel.org> Subject: linux-next: build failure after merge of the drm-intel tree Date: Tue, 10 Dec 2019 09:39:57 +1100 [thread overview] Message-ID: <20191210093957.5120f717@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 3184 bytes --] 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 <sfr@canb.auug.org.au> 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 { \ -- 2.24.0 -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, S@freedesktop.org, Linux Next Mailing List <linux-next@vger.kernel.org>, Qian Cai <cai@lca.pw>, Ingo Molnar <mingo@kernel.org> Subject: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree Date: Tue, 10 Dec 2019 09:39:57 +1100 [thread overview] Message-ID: <20191210093957.5120f717@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 3184 bytes --] 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 <sfr@canb.auug.org.au> 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 { \ -- 2.24.0 -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-12-09 22:40 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-09 22:39 Stephen Rothwell [this message] 2019-12-09 22:39 ` [Intel-gfx] linux-next: build failure after merge of the drm-intel tree Stephen Rothwell 2019-12-09 22:42 ` Stephen Rothwell 2019-12-09 22:42 ` [Intel-gfx] " Stephen Rothwell 2019-12-11 9:31 ` Jani Nikula 2019-12-11 9:31 ` [Intel-gfx] " Jani Nikula 2019-12-11 9:31 ` Jani Nikula 2019-12-09 23:27 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-intel tree (rev3) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2022-08-26 2:36 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell 2022-08-26 2:36 ` Stephen Rothwell 2022-08-26 7:50 ` Jani Nikula 2022-08-26 7:50 ` Jani Nikula 2022-04-26 2:08 Stephen Rothwell 2022-04-26 2:08 ` Stephen Rothwell 2022-04-26 7:36 ` Jani Nikula 2022-04-26 7:36 ` Jani Nikula 2022-02-15 1:10 Stephen Rothwell 2022-02-15 1:10 ` Stephen Rothwell 2022-02-15 12:11 ` Jani Nikula 2022-02-15 12:11 ` Jani Nikula 2021-05-21 1:58 Stephen Rothwell 2021-05-21 1:58 ` Stephen Rothwell 2021-01-19 23:57 Stephen Rothwell 2021-01-19 23:57 ` Stephen Rothwell 2021-01-21 1:11 ` Stephen Rothwell 2021-01-21 1:11 ` Stephen Rothwell 2019-03-27 2:59 Stephen Rothwell 2019-03-27 2:59 ` Stephen Rothwell 2019-03-27 11:07 ` Joonas Lahtinen 2019-03-27 11:07 ` Joonas Lahtinen 2019-03-27 11:31 ` Stephen Rothwell 2019-03-27 11:31 ` Stephen Rothwell 2018-07-13 1:54 Stephen Rothwell 2018-07-23 2:29 ` Stephen Rothwell 2018-05-08 1:07 Stephen Rothwell 2018-05-08 7:08 ` Oleksandr Andrushchenko 2018-05-08 7:08 ` Oleksandr Andrushchenko 2018-05-09 5:02 ` Stephen Rothwell 2018-05-09 5:02 ` Stephen Rothwell 2018-05-09 5:08 ` Christoph Hellwig 2018-05-09 5:18 ` Stephen Rothwell 2016-10-17 23:59 Stephen Rothwell 2016-10-18 6:26 ` Daniel Vetter 2016-08-23 1:56 Stephen Rothwell 2016-08-23 1:56 ` Stephen Rothwell 2016-08-23 16:33 ` Daniel Vetter 2016-08-23 16:33 ` Daniel Vetter 2016-05-23 2:24 Stephen Rothwell 2016-05-23 2:24 ` Stephen Rothwell 2014-04-03 1:24 Stephen Rothwell 2014-04-03 1:24 ` Stephen Rothwell 2014-03-19 0:53 Stephen Rothwell 2014-03-19 0:53 ` Stephen Rothwell 2014-03-19 1:18 ` Steven Rostedt 2014-03-19 1:18 ` Steven Rostedt 2013-02-15 2:37 Stephen Rothwell 2013-02-15 2:37 ` Stephen Rothwell 2013-02-15 9:30 ` Daniel Vetter 2013-02-15 9:30 ` Daniel Vetter 2013-02-15 16:16 ` Jesse Barnes 2013-02-19 2:01 ` Stephen Rothwell 2013-02-19 10:28 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191210093957.5120f717@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=S@freedesktop.org \ --cc=cai@lca.pw \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=rodrigo.vivi@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.