From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 04:23:51 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
X-Git-Tag: next-20120907~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c448a9f2994a5203969c2b214998590666c33a88;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
	arch/powerpc/include/asm/kvm_ppc.h
	arch/powerpc/kvm/e500_tlb.c
	include/linux/kvm.h
---

c448a9f2994a5203969c2b214998590666c33a88
diff --cc include/linux/kvm.h
index d808694673f9,f4f5be8dd58e..41a9fd5c61d8
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -622,9 -621,7 +625,10 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_PPC_GET_SMMU_INFO 78
  #define KVM_CAP_S390_COW 79
  #define KVM_CAP_PPC_ALLOC_HTAB 80
 -#define KVM_CAP_PPC_BOOKE_WATCHDOG 81
 +#ifdef __KVM_HAVE_READONLY_MEM
 +#define KVM_CAP_READONLY_MEM 81
 +#endif
++#define KVM_CAP_PPC_BOOKE_WATCHDOG 82
  
  #ifdef KVM_CAP_IRQ_ROUTING