[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090305114032.GB9548@elte.hu>
Date: Thu, 5 Mar 2009 12:40:32 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Joerg Roedel <joerg.roedel@....com>
Cc: Ingo Molnar <mingo@...hat.com>, iommu@...ts.linux-foundation.org,
linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] iommu fixes for 2.6.29-rc7
* Joerg Roedel <joerg.roedel@....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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists