From 1538bc4e5e9445b30f4388a9a971a3b330c95d96 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 5 Nov 2009 17:10:34 +1100
Subject: [PATCH] --- yaml --- r: 168273 b: refs/heads/master c:
 38634e6769920929385f1ffc8820dc3e893cc630 h: refs/heads/master i:   168271:
 5d65cdefe28beb0a48bce99e7941361988ca5ec6 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 7021615a167c..8514b45e6949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8435b027b87a78145992c37b0b8ed0f1b7761bf0
+refs/heads/master: 38634e6769920929385f1ffc8820dc3e893cc630
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++;