linux-next: build failure after merge of the dwmw2-iommu tree

linux-next: build failure after merge of the dwmw2-iommu tree

[Stephen Rothwell]

Hi David,

After merging the dwmw2-iommu tree, today's linux-next build (i386
defconfig) failed like this:

In file included from drivers/gpu/drm/i915/i915_drv.h:50:0,
                 from drivers/gpu/drm/i915/i915_drv.c:34:
include/linux/intel-iommu.h:477:22: error: field 'notifier' has incomplete type
  struct mmu_notifier notifier;
                      ^

Caused by commit

  a7002bccff99 ("iommu/vt-d: Add intel_svm_{un,}bind_mm() functions")

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Oct 2015 17:51:50 +1100
Subject: [PATCH] iommu/vt-d: fix for "Add intel_svm_{un,}bind_mm() functions"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/intel-iommu.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index aa7e02d623c9..39a382cbbbd4 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -474,7 +474,9 @@ extern int intel_svm_finish_prq(struct intel_iommu *iommu);
 
 struct intel_svm {
 	struct kref kref;
+#ifdef CONFIG_MMU_NOTIFIER
 	struct mmu_notifier notifier;
+#endif
 	struct mm_struct *mm;
 	struct intel_iommu *iommu;
 	struct device *dev;
-- 
2.5.3




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

Re: linux-next: build failure after merge of the dwmw2-iommu tree

[Stephen Rothwell]

Hi David,

On Mon, 12 Oct 2015 18:32:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the dwmw2-iommu tree, today's linux-next build (i386
> defconfig) failed like this:
> 
> In file included from drivers/gpu/drm/i915/i915_drv.h:50:0,
>                  from drivers/gpu/drm/i915/i915_drv.c:34:
> include/linux/intel-iommu.h:477:22: error: field 'notifier' has incomplete type
>   struct mmu_notifier notifier;
>                       ^
> 
> Caused by commit
> 
>   a7002bccff99 ("iommu/vt-d: Add intel_svm_{un,}bind_mm() functions")
> 
> I have added the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 12 Oct 2015 17:51:50 +1100
> Subject: [PATCH] iommu/vt-d: fix for "Add intel_svm_{un,}bind_mm() functions"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/linux/intel-iommu.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
> index aa7e02d623c9..39a382cbbbd4 100644
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@ -474,7 +474,9 @@ extern int intel_svm_finish_prq(struct intel_iommu *iommu);
>  
>  struct intel_svm {
>  	struct kref kref;
> +#ifdef CONFIG_MMU_NOTIFIER
>  	struct mmu_notifier notifier;
> +#endif
>  	struct mm_struct *mm;
>  	struct intel_iommu *iommu;
>  	struct device *dev;
> -- 
> 2.5.3

Ping?

Of course my patch did not apply today since the kref has now vanished
in a rebase ...

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

Re: linux-next: build failure after merge of the dwmw2-iommu tree

[David Woodhouse]

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

On Thu, 2015-10-15 at 13:55 +1100, Stephen Rothwell wrote:
> 
> Ping?
> 
> Of course my patch did not apply today since the kref has now 
> vanished in a rebase ...

The problem which required said patch should also be gone, though —
CONFIG_INTEL_IOMMU_SVM now selects CONFIG_MMU_NOTIFIER, and its data
structures are guarded with #ifdef CONFIG_INTEL_IOMMU_SVM.

Apologies for the lack of an explicit response (other than the implicit
one of fixing the problem). It should have occurred to me that you'd be
trying to carry the patch forward.

-- 
dwmw2


[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5691 bytes --]

Re: linux-next: build failure after merge of the dwmw2-iommu tree

[Stephen Rothwell]

Hi David,

On Thu, 15 Oct 2015 07:54:55 +0100 David Woodhouse <dwmw2@infradead.org> wrote:
>
> The problem which required said patch should also be gone, though —
> CONFIG_INTEL_IOMMU_SVM now selects CONFIG_MMU_NOTIFIER, and its data
> structures are guarded with #ifdef CONFIG_INTEL_IOMMU_SVM.
> 
> Apologies for the lack of an explicit response (other than the implicit
> one of fixing the problem). It should have occurred to me that you'd be
> trying to carry the patch forward.

Thanks, I will drop the patch now.

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