---

yaml --- r: 315848 b: refs/heads/master c: 9900b4b h: refs/heads/master v: v3
git-mirror · Jun 18, 2012 · 4cb5f0c · 4cb5f0c
1 parent 6375a8f
commit 4cb5f0c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcce0489477f07ac1331aee71f18d6274e19a9c1
+refs/heads/master: 9900b4b48b095895cf962054e45aafa49ef70f74
diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
@@ -802,7 +802,7 @@ static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_se
 }
 #endif
 
-#ifdef CONFIG_HAVE_KVM_IRQCHIP
+#ifdef KVM_CAP_IRQ_ROUTING
 
 #define KVM_MAX_IRQ_ROUTES 1024
 

diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
@@ -2225,7 +2225,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg)
 	case KVM_CAP_SIGNAL_MSI:
 #endif
 		return 1;
-#ifdef CONFIG_HAVE_KVM_IRQCHIP
+#ifdef KVM_CAP_IRQ_ROUTING
 	case KVM_CAP_IRQ_ROUTING:
 		return KVM_MAX_IRQ_ROUTES;
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     #endif
-    #ifdef CONFIG_HAVE_KVM_IRQCHIP
+    #ifdef KVM_CAP_IRQ_ROUTING
     #define KVM_MAX_IRQ_ROUTES 1024
@@ Expand Down @@