Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754142AbbDRS2f (ORCPT ); Sat, 18 Apr 2015 14:28:35 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:49844 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753754AbbDRS2c (ORCPT ); Sat, 18 Apr 2015 14:28:32 -0400 Message-ID: <5532A249.30703@roeck-us.net> Date: Sat, 18 Apr 2015 11:28:25 -0700 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Sowmini Varadhan CC: linux-kernel@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org Subject: Re: sparc64: Build failure due to commit f1600e549b94 (sparc: Make sparc64 use scalable lib/iommu-common.c functions) References: <20150418054705.GA10746@roeck-us.net> <20150418120510.GB1587@oracle.com> In-Reply-To: <20150418120510.GB1587@oracle.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020204.5532A250.0003,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1663 Lines: 46 On 04/18/2015 05:05 AM, Sowmini Varadhan wrote: > On (04/17/15 22:47), Guenter Roeck wrote: >> The problem is caused by commit f1600e549b94 ("sparc: Make sparc64 >> use scalable lib/iommu-common.c functions"), which introduces >> >> static DEFINE_PER_CPU(unsigned int, iommu_pool_hash); > > I have to confess that I'm a little confused about what happened here.. > > The specific patch (2/3) above should have come from this submission > http://www.spinics.net/lists/sparclinux/msg13786.html > aka > http://patchwork.ozlabs.org/patch/459803/ > > This does not add any additional defines for iommu_pool_hash. > > It also does not have any references to fields like page_table_map_base: > instead, these were switched over to things like: > - *dma_addrp = (iommu->page_table_map_base + > + *dma_addrp = (iommu->tbl.table_map_base + > ((iopte - iommu->page_table) << IO_PAGE_SHIFT)); > > > But when I clone > git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git > and do a git show of the commit-id above, I see deltas that > dont make sense (they seem to be from a patchset from somewhere > in the middle of the review chain from the thread). > > What am I missing? > Some merge gone wrong, maybe ? I tried to revert f1600e549b94 and apply http://patchwork.ozlabs.org/patch/459803/ instead. The result doesn't compile, so there may have been some other changes in the same area. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/