Re: [GIT PULL] iommu fixes for 2.6.29-rc7

[Ingo Molnar]

* Joerg Roedel <joerg.roedel@xxxxxxx> wrote:

> On Thu, Mar 05, 2009 at 12:40:32PM +0100, Ingo Molnar wrote:
> > > 
> > > Joerg
> > > 
> > > Here is the full diff:
> > > 
> > > diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
> > > index 5113c08..d7a7c4c 100644
> > > --- a/arch/x86/kernel/amd_iommu.c
> > > +++ b/arch/x86/kernel/amd_iommu.c
> > > @@ -23,9 +23,7 @@
> > >  #include <linux/debugfs.h>
> > >  #include <linux/scatterlist.h>
> > >  #include <linux/iommu-helper.h>
> > > -#ifdef CONFIG_IOMMU_API
> > >  #include <linux/iommu.h>
> > > -#endif
> > >  #include <asm/proto.h>
> > >  #include <asm/iommu.h>
> > >  #include <asm/gart.h>
> > 
> > hm, is this one really needed for .29? We are in late-rc freeze 
> > mode.
> > 
> > > diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c
> > > index 5e039d4..c2d1eed 100644
> > > --- a/drivers/base/iommu.c
> > > +++ b/drivers/base/iommu.c
> > > @@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops)
> > >  	iommu_ops = ops;
> > >  }
> > >  
> > > -bool iommu_found()
> > > +bool iommu_found(void)
> > >  {
> > >  	return iommu_ops != NULL;
> > >  }
> > 
> > that's ugly indeed albeit too not critical and not a regression 
> > fix. My inclination would be to pull for the .30 merge window.
> 
> All this is uncritical. We can merge it in the .30 merge 
> window if its already too late.

Pulled into tip:core/iommu, thanks Joerg!

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/