From: Avi Kivity <avi@redhat.com>
Date: Sun, 15 Nov 2009 14:23:31 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=212b1ccd9ffb1ed9a7abdcdc57e1d7d31486945b;p=users%2Fdwmw2%2Flinux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/powerpc/kvm/timing.h

Signed-off-by: Avi Kivity <avi@redhat.com>
---

212b1ccd9ffb1ed9a7abdcdc57e1d7d31486945b
diff --cc arch/powerpc/kvm/timing.h
index a550f0ffeab18,806ef67868bd8..8167d42a776f0
--- a/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@@ -48,7 -48,11 +48,11 @@@ static inline void kvmppc_set_exit_type
  static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
  {
  	/* type has to be known at build time for optimization */
+ 
+ 	/* The BUILD_BUG_ON below breaks in funny ways, commented out
+ 	 * for now ... -BenH
 -	BUILD_BUG_ON(__builtin_constant_p(type));
 +	BUILD_BUG_ON(!__builtin_constant_p(type));
+ 	*/
  	switch (type) {
  	case EXT_INTR_EXITS:
  		vcpu->stat.ext_intr_exits++;