From de25568bbeed3ffdf20b8316b65636023f3b9c18 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 30 Oct 2009 05:47:01 +0000
Subject: [PATCH] --- yaml --- r: 175728 b: refs/heads/master c:
 4e755758cbbeb0afe44556c1ce52ea6f590ed5bf h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kvm/booke.c   | 5 +++++
 trunk/arch/powerpc/kvm/powerpc.c | 5 -----
 trunk/arch/powerpc/kvm/timing.h  | 4 ----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7b46d28f9763..cf1265b0f1fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41c8c46bfe52488779e227b77222402579573ccf
+refs/heads/master: 4e755758cbbeb0afe44556c1ce52ea6f590ed5bf
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
index e7bf4d029484..06f5a9ecc42c 100644
--- a/trunk/arch/powerpc/kvm/booke.c
+++ b/trunk/arch/powerpc/kvm/booke.c
@@ -520,6 +520,11 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
 	return kvmppc_core_vcpu_translate(vcpu, tr);
 }
 
+int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
+{
+	return -ENOTSUPP;
+}
+
 int __init kvmppc_booke_init(void)
 {
 	unsigned long ivor[16];
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
index 2a4551f78f60..a06ecc3401fd 100644
--- a/trunk/arch/powerpc/kvm/powerpc.c
+++ b/trunk/arch/powerpc/kvm/powerpc.c
@@ -409,11 +409,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	return r;
 }
 
-int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
-{
-	return -ENOTSUPP;
-}
-
 long kvm_arch_vm_ioctl(struct file *filp,
                        unsigned int ioctl, unsigned long arg)
 {
diff --git a/trunk/arch/powerpc/kvm/timing.h b/trunk/arch/powerpc/kvm/timing.h
index 806ef67868bd..bb13b1f3cd5a 100644
--- a/trunk/arch/powerpc/kvm/timing.h
+++ b/trunk/arch/powerpc/kvm/timing.h
@@ -48,11 +48,7 @@ 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++;