From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Mon, 28 Jan 2008 23:42:34 +0000 (-0600)
Subject: KVM: Use CONFIG_PREEMPT_NOTIFIERS around struct preempt_notifier
X-Git-Tag: v2.6.26-rc1~1028^2~133
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31bb117eb48f2629e030ca547ca89a1c34150183;p=linux-2.6

KVM: Use CONFIG_PREEMPT_NOTIFIERS around struct preempt_notifier

This allows kvm_host.h to be #included even when struct preempt_notifier is
undefined. This is needed to build ppc asm-offsets.h.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 928b0d59e9..b90ca368dc 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -67,7 +67,9 @@ void kvm_io_bus_register_dev(struct kvm_io_bus *bus,
 
 struct kvm_vcpu {
 	struct kvm *kvm;
+#ifdef CONFIG_PREEMPT_NOTIFIERS
 	struct preempt_notifier preempt_notifier;
+#endif
 	int vcpu_id;
 	struct mutex mutex;
 	int   cpu;