From 5b7838e3f64121a9ea206480b6d171537a5168e8 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Mon, 28 Jan 2008 17:42:34 -0600
Subject: [PATCH] --- yaml --- r: 93779 b: refs/heads/master c:
 31bb117eb48f2629e030ca547ca89a1c34150183 h: refs/heads/master i:   93777:
 b16a287d6a478089ec19eea617732f85a0b5934d   93775:
 2bfcee310b833302caebf5fad4e144ee86be47a5 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/kvm_host.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61bbaba855e1..24f4f509027d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2384d2b32640839a4d4d260ca7c5aa4edbf68d91
+refs/heads/master: 31bb117eb48f2629e030ca547ca89a1c34150183
diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
index 928b0d59e9ba..b90ca368dcf6 100644
--- a/trunk/include/linux/kvm_host.h
+++ b/trunk/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;