linux-next: dwmw2-iommu tree build failure

linux-next: dwmw2-iommu tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

Hi David,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/pci/intel-iommu.c: In function 'dmar_init_reserved_ranges':
drivers/pci/intel-iommu.c:1323: error: 'struct iova_domain' has no member named 'iova_alloc_lock'

Caused by commit b25c32b0af7045d3837c44d9685358aeeb9b7ac8 ("intel-iommu:
Remove superfluous iova_alloc_lock from IOVA code").

I have used the verion of the dwmw2-iommu tree from next-20090714 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: dwmw2-iommu tree build failure

[David Woodhouse]

On Wed, 2009-07-15 at 14:01 +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/pci/intel-iommu.c: In function 'dmar_init_reserved_ranges':
> drivers/pci/intel-iommu.c:1323: error: 'struct iova_domain' has no member named 'iova_alloc_lock'
> 
> Caused by commit b25c32b0af7045d3837c44d9685358aeeb9b7ac8 ("intel-iommu:
> Remove superfluous iova_alloc_lock from IOVA code").

Oops, I need to kill the lockdep references to that lock too. Fixed now;
thanks.

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: linux-next: dwmw2-iommu tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

Hi David,

On Wed, 15 Jul 2009 08:29:19 +0100 David Woodhouse <dwmw2@infradead.org> wrote:
>
> Oops, I need to kill the lockdep references to that lock too. Fixed now;

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: dwmw2-iommu tree build failure

[Stephen Rothwell]

Hi David,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/pci/intel-iommu.c: In function 'iommu_prepare_identity_map':
drivers/pci/intel-iommu.c:1979: error: implicit declaration of function 'dmi_get_system_info'

Caused by commit 2ff729f5445cc47d1910386c36e53fc6b1c5e47a ("intel-iommu:
Cope with yet another BIOS screwup causing crashes") from the dwmw2-iommu
tree interacting with commit 2e15511d37cded52140573b72c3b5b085fdb7f80
("ACPI: linux/acpi.h should not include linux/dmi.h") from he acpi tree.

This file needs to include linux/dmi.h directly ... I applied the
following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Aug 2009 15:20:33 +1000
Subject: [PATCH] intel-iommu: include linux/dmi.h to use dmi_ routines

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/intel-iommu.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index d36fa80..2ec5899 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -37,6 +37,7 @@
 #include <linux/iommu.h>
 #include <linux/intel-iommu.h>
 #include <linux/sysdev.h>
+#include <linux/dmi.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 #include "pci.h"
-- 
1.6.3.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au