public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the dwmw2-iommu tree
Date: Thu, 15 Oct 2015 13:55:00 +1100	[thread overview]
Message-ID: <20151015135500.5fe9af8f@canb.auug.org.au> (raw)
In-Reply-To: <20151012183257.258edc4c@canb.auug.org.au>

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

  reply	other threads:[~2015-10-15  2:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12  7:32 linux-next: build failure after merge of the dwmw2-iommu tree Stephen Rothwell
2015-10-15  2:55 ` Stephen Rothwell [this message]
2015-10-15  6:54   ` David Woodhouse
2015-10-15  7:28     ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151015135500.5fe9af8f@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dwmw2@infradead$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox