[GIT PULL] MIPS KVM fix for v4.9-rc2

[GIT PULL] MIPS KVM fix for v4.9-rc2

[James Hogan]

Hi Radim, Paolo,

The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:

  Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git tags/kvm_mips_4.9_2

for you to fetch changes up to d852b5f35e84e60c930589eeb14a6df21ea9b1cb:

  KVM: MIPS: Add missing uaccess.h include (2016-10-19 00:37:05 +0100)

I'd already based this on v4.9-rc1 rather than the kvm next branch which
isn't up to v4.9-rc1 yet. If thats a problem I can easily rebase, or
feel free to apply the patch directly.

Cheers
James

----------------------------------------------------------------
MIPS KVM fix for v4.9-rc2

- Fix build error introduced during the 4.9 merge window when
  tracepoints are disabled.

----------------------------------------------------------------
James Hogan (1):
      KVM: MIPS: Add missing uaccess.h include

 arch/mips/kvm/mips.c | 1 +
 1 file changed, 1 insertion(+)

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
-- 
2.7.3

[GIT PULL] KVM: MIPS: Add missing uaccess.h include

[James Hogan]

MIPS KVM uses user memory accessors but mips.c doesn't directly include
uaccess.h, so include it now.

This wasn't too much of a problem before v4.9-rc1 as asm/module.h
included asm/uaccess.h, however since commit 29abfbd9cbba ("mips:
separate extable.h, switch module.h to it") this is no longer the case.

This resulted in build failures when trace points were disabled, as
trace/define_trace.h includes trace/trace_events.h only ifdef
TRACEPOINTS_ENABLED, which goes on to include asm/uaccess.h via a couple
of other headers.

Fixes: 29abfbd9cbba ("mips: separate extable.h, switch module.h to it")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
---
 arch/mips/kvm/mips.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index ce961495b5e1..622037d851a3 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 #include <linux/kdebug.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/bootmem.h>
-- 
2.7.3

Re: [GIT PULL] MIPS KVM fix for v4.9-rc2

[Radim Krčmář]

2016-10-20 14:52+0100, James Hogan:
> Hi Radim, Paolo,
> 
> The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
> 
>   Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git tags/kvm_mips_4.9_2
> 
> for you to fetch changes up to d852b5f35e84e60c930589eeb14a6df21ea9b1cb:
> 
>   KVM: MIPS: Add missing uaccess.h include (2016-10-19 00:37:05 +0100)
> 
> I'd already based this on v4.9-rc1 rather than the kvm next branch which
> isn't up to v4.9-rc1 yet. If thats a problem I can easily rebase, or
> feel free to apply the patch directly.

Not a problem, I would have done that anyway.

Pulled, thanks.

Btw. patches for -rc2+ kernels ought to be based on kvm/master.
It doesn't matter now, but kvm/master and kvm/next will diverge at -rc3
(max 4), when patches intended for 4.10 are going to be applied to
kvm/next.  And kvm/next isn't rebased, so it will stay on -rc[34] until
Linus pulls in the 4.10 merge window.

Re: [GIT PULL] MIPS KVM fix for v4.9-rc2

[James Hogan]

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

On Thu, Oct 20, 2016 at 08:04:50PM +0200, Radim Krčmář wrote:
> 2016-10-20 14:52+0100, James Hogan:
> > Hi Radim, Paolo,
> > 
> > The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
> > 
> >   Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git tags/kvm_mips_4.9_2
> > 
> > for you to fetch changes up to d852b5f35e84e60c930589eeb14a6df21ea9b1cb:
> > 
> >   KVM: MIPS: Add missing uaccess.h include (2016-10-19 00:37:05 +0100)
> > 
> > I'd already based this on v4.9-rc1 rather than the kvm next branch which
> > isn't up to v4.9-rc1 yet. If thats a problem I can easily rebase, or
> > feel free to apply the patch directly.
> 
> Not a problem, I would have done that anyway.
> 
> Pulled, thanks.
> 
> Btw. patches for -rc2+ kernels ought to be based on kvm/master.
> It doesn't matter now, but kvm/master and kvm/next will diverge at -rc3
> (max 4), when patches intended for 4.10 are going to be applied to
> kvm/next.  And kvm/next isn't rebased, so it will stay on -rc[34] until
> Linus pulls in the 4.10 merge window.

Okay cool, thanks for the info.

What is the queue branch for?

Cheers
James

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

Re: [GIT PULL] MIPS KVM fix for v4.9-rc2

[Radim Krčmář]

2016-10-20 20:26+0100, James Hogan:
> What is the queue branch for?

It is a staging branch.  All patches applied by Paolo or me usually
start in kvm/queue.
Applying to kvm/queue means that we think that the patch is ok, but it
is by no means final -- the on-list review continues and we add r-b
tags, do minimal changes, or even drop patches according to feedback.
Patches are tested in kvm/queue before being included in a permanent
branch.