From 5b2dc0fd38d091e0f35b13e0ab5355305e448608 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 5 Nov 2009 17:16:13 +1100
Subject: [PATCH] --- yaml --- r: 175755 b: refs/heads/master c:
 d4e09f8432a428d6a46ca4f3c2b28d0385f5b93d h: refs/heads/master i:   175753:
 da2331b317f4ed859be476b2ef605bb1cb3435b1   175751:
 a50cb9b9dff9588e4494e65b1a22882fb74097a6 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kvm/timing.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c8c70a903f4a..d90d436ae158 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 544c6761bb05a1dd19a39cb9bed096273f9bdb36
+refs/heads/master: d4e09f8432a428d6a46ca4f3c2b28d0385f5b93d
diff --git a/trunk/arch/powerpc/kvm/timing.h b/trunk/arch/powerpc/kvm/timing.h
index bb13b1f3cd5a..806ef67868bd 100644
--- a/trunk/arch/powerpc/kvm/timing.h
+++ b/trunk/arch/powerpc/kvm/timing.h
@@ -48,7 +48,11 @@ static inline void kvmppc_set_exit_type(struct kvm_vcpu *vcpu, int 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));
+	*/
 	switch (type) {
 	case EXT_INTR_EXITS:
 		vcpu->stat.ext_intr_exits++;