Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753538AbdDEHZF (ORCPT ); Wed, 5 Apr 2017 03:25:05 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:16582 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdDEHZD (ORCPT ); Wed, 5 Apr 2017 03:25:03 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 05 Apr 2017 00:21:36 -0700 Subject: Re: linux-next: build failure after merge of the tip tree To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Thierry Reding References: <20170405133628.4c9041f1@canb.auug.org.au> CC: Linux-Next Mailing List , "Linux Kernel Mailing List" , Arto Merilainen , Alexandre Courbot From: Mikko Perttunen Message-ID: Date: Wed, 5 Apr 2017 10:24:56 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20170405133628.4c9041f1@canb.auug.org.au> X-Originating-IP: [10.21.26.175] X-ClientProxiedBy: UKMAIL102.nvidia.com (10.26.138.15) To UKMAIL102.nvidia.com (10.26.138.15) Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2061 Lines: 38 On 05.04.2017 06:36, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/built-in.o:(__tracepoints+0x64): multiple definition of `__tracepoint_remove_device_from_group' > drivers/iommu/built-in.o:(__tracepoints+0x64): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x3c): multiple definition of `__tracepoint_detach_device_from_domain' > drivers/iommu/built-in.o:(__tracepoints+0x3c): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x0): multiple definition of `__tracepoint_io_page_fault' > drivers/iommu/built-in.o:(__tracepoints+0x0): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x78): multiple definition of `__tracepoint_add_device_to_group' > drivers/iommu/built-in.o:(__tracepoints+0x78): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x14): multiple definition of `__tracepoint_unmap' > drivers/iommu/built-in.o:(__tracepoints+0x14): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x28): multiple definition of `__tracepoint_map' > drivers/iommu/built-in.o:(__tracepoints+0x28): first defined here > drivers/gpu/built-in.o:(__tracepoints+0x50): multiple definition of `__tracepoint_attach_device_to_domain' > drivers/iommu/built-in.o:(__tracepoints+0x50): first defined here > > The tip tree has not changed since yesterday. However, reverting > the drm-tegra tree fixes the build problem. So there is some interaction > between the tip tree and today's drm-tegra tree. > > So for now, I have reverted the merge of the drm-tegra tree. > Looks like this is caused by my patch to add IOMMU support to Host1x. I'm confused by how it doesn't appear on ARMv8, though. The cause is that host1x/dev.c defines CREATE_TRACE_POINTS and includes trace/events/host1x.h, which is fine. However, it then also includes, among other local files, dev.h. This used to be fine, but my patch adds an include of linux/iommu.h to dev.h, so we get this failure. I'll post a fix shortly. Thanks, Mikko.