* [GIT PULL] iommu fixes for 2.6.29-rc7
@ 2009-03-05 11:22 Joerg Roedel
2009-03-05 11:40 ` Ingo Molnar
0 siblings, 1 reply; 4+ messages in thread
From: Joerg Roedel @ 2009-03-05 11:22 UTC (permalink / raw)
To: Ingo Molnar; +Cc: iommu, linux-kernel
Hi Ingo,
The following changes since commit 559595a985e106d2fa9f0c79b7f5805453fed593:
Linus Torvalds (1):
Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu/fixes-2.6.29
FUJITA Tomonori (1):
AMD IOMMU: remove unnecessary ifdef
Hannes Eder (1):
IOMMU-API: use ANSI style function declaration for 'iommu_found'
arch/x86/kernel/amd_iommu.c | 2 --
drivers/base/iommu.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
One fix is for AMD IOMMU and the other one for the IOMMU-API. Please
pull.
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>
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;
}
--
| AMD Saxony Limited Liability Company & Co. KG
Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany
System | Register Court Dresden: HRA 4896
Research | General Partner authorized to represent:
Center | AMD Saxony LLC (Wilmington, Delaware, US)
| General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [GIT PULL] iommu fixes for 2.6.29-rc7
2009-03-05 11:22 [GIT PULL] iommu fixes for 2.6.29-rc7 Joerg Roedel
@ 2009-03-05 11:40 ` Ingo Molnar
2009-03-05 11:44 ` Joerg Roedel
0 siblings, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2009-03-05 11:40 UTC (permalink / raw)
To: Joerg Roedel; +Cc: Ingo Molnar, iommu, linux-kernel
* Joerg Roedel <joerg.roedel@amd.com> wrote:
> Hi Ingo,
>
> The following changes since commit 559595a985e106d2fa9f0c79b7f5805453fed593:
> Linus Torvalds (1):
> Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu/fixes-2.6.29
>
> FUJITA Tomonori (1):
> AMD IOMMU: remove unnecessary ifdef
>
> Hannes Eder (1):
> IOMMU-API: use ANSI style function declaration for 'iommu_found'
>
> arch/x86/kernel/amd_iommu.c | 2 --
> drivers/base/iommu.c | 2 +-
> 2 files changed, 1 insertions(+), 3 deletions(-)
>
> One fix is for AMD IOMMU and the other one for the IOMMU-API.
> Please pull.
>
> 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.
Ingo
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] iommu fixes for 2.6.29-rc7
2009-03-05 11:40 ` Ingo Molnar
@ 2009-03-05 11:44 ` Joerg Roedel
2009-03-05 11:54 ` Ingo Molnar
0 siblings, 1 reply; 4+ messages in thread
From: Joerg Roedel @ 2009-03-05 11:44 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Ingo Molnar, iommu, linux-kernel
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.
Joerg
--
| Advanced Micro Devices GmbH
Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
System |
Research | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
| Registergericht München, HRB Nr. 43632
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] iommu fixes for 2.6.29-rc7
2009-03-05 11:44 ` Joerg Roedel
@ 2009-03-05 11:54 ` Ingo Molnar
0 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2009-03-05 11:54 UTC (permalink / raw)
To: Joerg Roedel; +Cc: Ingo Molnar, iommu, linux-kernel
* Joerg Roedel <joerg.roedel@amd.com> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-03-05 11:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-05 11:22 [GIT PULL] iommu fixes for 2.6.29-rc7 Joerg Roedel
2009-03-05 11:40 ` Ingo Molnar
2009-03-05 11:44 ` Joerg Roedel
2009-03-05 11:54 ` Ingo Molnar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.