From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2011 05:27:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20110927~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=508d350cf9421b55f387c0ddfde2e57e67a337c0;p=karo-tx-linux.git

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

Conflicts:
	include/linux/kvm.h
---

508d350cf9421b55f387c0ddfde2e57e67a337c0
diff --cc include/linux/kvm.h
index aace6b8691a2,55f5afb75936..206979877888
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -553,7 -553,7 +553,8 @@@ struct kvm_ppc_pvinfo 
  #define KVM_CAP_SPAPR_TCE 63
  #define KVM_CAP_PPC_SMT 64
  #define KVM_CAP_PPC_RMA	65
+ #define KVM_CAP_MAX_VCPUS 66       /* returns max vcpus per vm */
 +#define KVM_CAP_S390_GMAP 71
  
  #ifdef KVM_CAP_IRQ_ROUTING