From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Aug 2014 18:35:30 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v3.17-rc1~87
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=66bb0aa077978dbb76e6283531eb3cc7a878de38;p=linux-2.6-block.git

Merge tag 'for-linus' of git://git./virt/kvm/kvm

Pull second round of KVM changes from Paolo Bonzini:
 "Here are the PPC and ARM changes for KVM, which I separated because
  they had small conflicts (respectively within KVM documentation, and
  with 3.16-rc changes).  Since they were all within the subsystem, I
  took care of them.

  Stephen Rothwell reported some snags in PPC builds, but they are all
  fixed now; the latest linux-next report was clean.

  New features for ARM include:
   - KVM VGIC v2 emulation on GICv3 hardware
   - Big-Endian support for arm/arm64 (guest and host)
   - Debug Architecture support for arm64 (arm32 is on Christoffer's todo list)

  And for PPC:
   - Book3S: Good number of LE host fixes, enable HV on LE
   - Book3S HV: Add in-guest debug support

  This release drops support for KVM on the PPC440.  As a result, the
  PPC merge removes more lines than it adds.  :)

  I also included an x86 change, since Davidlohr tied it to an
  independent bug report and the reporter quickly provided a Tested-by;
  there was no reason to wait for -rc2"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (122 commits)
  KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
  KVM: nVMX: fix "acknowledge interrupt on exit" when APICv is in use
  KVM: nVMX: Fix nested vmexit ack intr before load vmcs01
  KVM: PPC: Enable IRQFD support for the XICS interrupt controller
  KVM: Give IRQFD its own separate enabling Kconfig option
  KVM: Move irq notifier implementation into eventfd.c
  KVM: Move all accesses to kvm::irq_routing into irqchip.c
  KVM: irqchip: Provide and use accessors for irq routing table
  KVM: Don't keep reference to irq routing table in irqfd struct
  KVM: PPC: drop duplicate tracepoint
  arm64: KVM: fix 64bit CP15 VM access for 32bit guests
  KVM: arm64: GICv3: mandate page-aligned GICV region
  arm64: KVM: GICv3: move system register access to msr_s/mrs_s
  KVM: PPC: PR: Handle FSCR feature deselects
  KVM: PPC: HV: Remove generic instruction emulation
  KVM: PPC: BOOKEHV: rename e500hv_spr to bookehv_spr
  KVM: PPC: Remove DCR handling
  KVM: PPC: Expose helper functions for data/inst faults
  KVM: PPC: Separate loadstore emulation from priv emulation
  KVM: PPC: Handle magic page in kvmppc_ld/st
  ...
---

66bb0aa077978dbb76e6283531eb3cc7a878de38
diff --cc arch/arm/kvm/init.S
index b2d229f09c07,2cc14dfad049..991415d978b6
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@@ -135,10 -134,10 +135,10 @@@ phase2
  	ldr	r0, =TRAMPOLINE_VA
  	adr	r1, target
  	bfi	r0, r1, #0, #PAGE_SHIFT
 -	mov	pc, r0
 +	ret	r0
  
  target:	@ We're now in the trampoline code, switch page tables
- 	mcrr	p15, 4, r2, r3, c2
+ 	mcrr	p15, 4, rr_lo_hi(r2, r3), c2
  	isb
  
  	@ Invalidate the old TLBs