Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933548AbdCHBSA (ORCPT ); Tue, 7 Mar 2017 20:18:00 -0500 Received: from ozlabs.org ([103.22.144.67]:35275 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933443AbdCHBRw (ORCPT ); Tue, 7 Mar 2017 20:17:52 -0500 Date: Wed, 8 Mar 2017 12:16:45 +1100 From: Stephen Rothwell To: "Paul E. McKenney" , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson Subject: linux-next: build failure after merge of the rcu tree Message-ID: <20170308121645.6160e711@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2123 Lines: 65 Hi Paul, After merging the rcu tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/resource_ext.h:19:0, from include/linux/pci.h:32, from include/drm/drmP.h:50, from drivers/gpu/drm/i915/i915_gem.c:28: drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function 'mock_gem_device': drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:9: error: 'SLAB_DESTROY_BY_RCU' undeclared (first use in this function) SLAB_DESTROY_BY_RCU); ^ include/linux/slab.h:149:4: note: in definition of macro 'KMEM_CACHE' (__flags), NULL) ^ drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:9: note: each undeclared identifier is reported only once for each function it appears in SLAB_DESTROY_BY_RCU); ^ include/linux/slab.h:149:4: note: in definition of macro 'KMEM_CACHE' (__flags), NULL) ^ / Caused by commit 24b7cb25b8d1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU") interacting with commit 0daf0113cff6 ("drm/i915: Mock infrastructure for request emission") from the drm-intel tree. I added the following merge fix patch: From: Stephen Rothwell Date: Wed, 8 Mar 2017 12:09:49 +1100 Subject: [PATCH] drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c index 6a8258eacdcb..9f24c5da3f8d 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c @@ -174,7 +174,7 @@ struct drm_i915_private *mock_gem_device(void) i915->requests = KMEM_CACHE(mock_request, SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT | - SLAB_DESTROY_BY_RCU); + SLAB_TYPESAFE_BY_RCU); if (!i915->requests) goto err_vmas; -- 2.11.0 -- Cheers, Stephen Rothwell