From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 5 Nov 2009 06:10:34 +0000 (+1100)
Subject: powerpc/kvm: Remove problematic BUILD_BUG_ON statement
X-Git-Tag: v2.6.32-rc7~69^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=38634e6769920929385f1ffc8820dc3e893cc630;p=linux-2.6-block.git

powerpc/kvm: Remove problematic BUILD_BUG_ON statement

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h
index bb13b1f3cd5a..806ef67868bd 100644
--- a/arch/powerpc/kvm/timing.h
+++ b/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++;