Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/hyperv changes from Ingo Molnar:
 "The biggest change is support for Windows 8's improved hypervisor
  interrupt model on the Linux Hyper-V guest subsystem code side.

  Smallish fixes otherwise."

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, hyperv: HYPERV depends on X86_LOCAL_APIC
  X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts
  X86: Add a check to catch Xen emulation of Hyper-V
  x86: Hyper-V: register clocksource only if its advertised

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 74d77dfa5f63..22f77c5f6012 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -1787,7 +1787,7 @@ void xen_callback_vector(void)
         int rc;
         uint64_t callback_via;
         if (xen_have_vector_callback) {
-                callback_via = HVM_CALLBACK_VECTOR(XEN_HVM_EVTCHN_CALLBACK);
+                callback_via = HVM_CALLBACK_VECTOR(HYPERVISOR_CALLBACK_VECTOR);
                 rc = xen_set_callback_via(callback_via);
                 if (rc) {
                         printk(KERN_ERR "Request for Xen HVM callback vector"
@@ -1798,8 +1798,9 @@ void xen_callback_vector(void)
                 printk(KERN_INFO "Xen HVM callback vector for event delivery is "
                                 "enabled\n");
                 /* in the restore case the vector has already been allocated */
-                if (!test_bit(XEN_HVM_EVTCHN_CALLBACK, used_vectors))
-                        alloc_intr_gate(XEN_HVM_EVTCHN_CALLBACK, xen_hvm_callback_vector);
+                if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors))
+                        alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,
+                                        xen_hvm_callback_vector);
         }
 }
 #else