From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754346Ab1JKKVa (ORCPT ); Tue, 11 Oct 2011 06:21:30 -0400 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184]:52173 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752231Ab1JKKV2 (ORCPT ); Tue, 11 Oct 2011 06:21:28 -0400 X-SpamScore: -21 X-BigFish: VPS-21(zz9371K1432N98dKzz1202hzz15d4R8275bhz32i668h839h944h) X-Forefront-Antispam-Report: CIP:163.181.249.109;KIP:(null);UIP:(null);IPVD:NLI;H:ausb3twp02.amd.com;RD:none;EFVD:NLI X-WSS-ID: 0LSWCRG-02-3ZN-02 X-M-MSG: Date: Tue, 11 Oct 2011 12:21:15 +0200 From: "Roedel, Joerg" To: Ohad Ben-Cohen CC: "iommu@lists.linux-foundation.org" , "linux-omap@vger.kernel.org" , Laurent Pinchart , David Woodhouse , "linux-arm-kernel@lists.infradead.org" , David Brown , Arnd Bergmann , "linux-kernel@vger.kernel.org" , Stepan Moskovchenko , "kvm@vger.kernel.org" , Hiroshi Doyu Subject: Re: [PATCH v3 1/6] iommu/core: split mapping to page sizes as supported by the hardware Message-ID: <20111011102115.GE2138@amd.com> References: <20110927131222.GL2138@amd.com> <20110927181438.GM2138@amd.com> <20111010094738.GW2138@amd.com> <20111010153609.GB2138@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: amd.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 10, 2011 at 06:01:06PM -0400, Ohad Ben-Cohen wrote: > > On Mon, Oct 10, 2011 at 5:36 PM, Roedel, Joerg wrote: > >> The master branch is best to base your patches on for generic work. > > It looks like the master branch is missing something like this: > > >From acb316aa4bcaf383e8cb1580e30c8635e0a34369 Mon Sep 17 00:00:00 2001 > From: Ohad Ben-Cohen > Date: Mon, 10 Oct 2011 23:55:51 +0200 > Subject: [PATCH] iommu/core: fix build issue > > Fix this: > > drivers/iommu/iommu.c: In function 'iommu_commit': > drivers/iommu/iommu.c:291: error: 'iommu_ops' undeclared (first use in > this function) > > Signed-off-by: Ohad Ben-Cohen > --- > drivers/iommu/iommu.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index 909b0d2..a5131f1 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -288,7 +288,7 @@ EXPORT_SYMBOL_GPL(iommu_unmap); > > void iommu_commit(struct iommu_domain *domain) > { > - if (iommu_ops->commit) > - iommu_ops->commit(domain); > + if (domain->ops->commit) > + domain->ops->commit(domain); > } > EXPORT_SYMBOL_GPL(iommu_commit); > -- > 1.7.4.1 Whoops. This iommu_commit branch wasn't meant to be in master already. I'll try to fix that. Joerg -- AMD Operating System Research Center Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632