Patchwork powerpc/kvm: Remove problematic BUILD_BUG_ON statement

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Nov. 5, 2009, 6:12 a.m.
Message ID <1257401570.13611.103.camel@pasglop>
Download mbox | patch
Permalink /patch/37727/
State Accepted, archived
Commit 41c8c46bfe52488779e227b77222402579573ccf
Headers show

Comments

Benjamin Herrenschmidt - Nov. 5, 2009, 6:12 a.m.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

I'm going to stick this into my -merge branch and send it to Linus today
until we fix it for real

Patch

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