Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

diff --combined arch/powerpc/include/asm/kvm_host.h
index 271fefbbe521badbc1a232b8f3583fb10833388b,8c8f2435a13db9f1809b1cd1124af2ef9336dec0..9d08d8cbed1a1ec0e5893679c5e1fd9cb69dce09
--- 1/arch/powerpc/include/asm/kvm_host.h
--- 2/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@@ -38,8 -38,7 +38,7 @@@
  
  #define KVM_MAX_VCPUS         NR_CPUS
  #define KVM_MAX_VCORES                NR_CPUS
- #define KVM_USER_MEM_SLOTS 32
- #define KVM_MEM_SLOTS_NUM KVM_USER_MEM_SLOTS
+ #define KVM_USER_MEM_SLOTS    512
  
  #ifdef CONFIG_KVM_MMIO
  #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@@ -50,10 -49,6 +49,10 @@@
  #define KVM_NR_IRQCHIPS          1
  #define KVM_IRQCHIP_NUM_PINS     256
  
 +/* PPC-specific vcpu->requests bit members */
 +#define KVM_REQ_WATCHDOG           8
 +#define KVM_REQ_EPR_EXIT           9
 +
  #include <linux/mmu_notifier.h>
  
  #define KVM_ARCH_WANT_MMU_NOTIFIER