On Thu, 30 Jul 2009 16:15:18 -0600
Alex Williamson <alex.williamson@xxxxxx> wrote:
> This avoids a "Malformed early option 'iommu'" on boot when trying
> to use pass-through mode.
>
> Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
> ---
>
> Looks like maybe this was copied from "usedac", which seems to
> return 1 because it's deprecated.
>
> arch/x86/kernel/pci-dma.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
> index 1a041bc..ae13e34 100644
> --- a/arch/x86/kernel/pci-dma.c
> +++ b/arch/x86/kernel/pci-dma.c
> @@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
> if (!strncmp(p, "soft", 4))
> swiotlb = 1;
> #endif
> - if (!strncmp(p, "pt", 2)) {
> + if (!strncmp(p, "pt", 2))
> iommu_pass_through = 1;
> - return 1;
> - }
>
> gart_parse_options(p);
Applied to linux-next, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
