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

Pull x86 hyperv updates from Ingo Molnar:
 "Misc updates related to page size abstractions within the HyperV code,
  in preparation for future features"

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  drivers: hv: vmbus: Replace page definition with Hyper-V specific one
  x86/hyperv: Add functions to allocate/deallocate page for Hyper-V
  x86/hyperv: Create and use Hyper-V page definitions

diff --combined drivers/hv/hyperv_vmbus.h
index fb16a62,6bf64cb..50eaa1f
--- 1/drivers/hv/hyperv_vmbus.h
--- 2/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@@ -146,6 -146,8 +146,6 @@@ struct hv_context 
         */
        u64 guestid;
  
 -      void *tsc_page;
 -
        struct hv_per_cpu_context __percpu *cpu_context;
  
        /*
@@@ -190,11 -192,11 +190,11 @@@ int hv_ringbuffer_read(struct vmbus_cha
                       u64 *requestid, bool raw);
  
  /*
-  * Maximum channels is determined by the size of the interrupt page
-  * which is PAGE_SIZE. 1/2 of PAGE_SIZE is for send endpoint interrupt
-  * and the other is receive endpoint interrupt
+  * The Maximum number of channels (16348) is determined by the size of the
+  * interrupt page, which is HV_HYP_PAGE_SIZE. 1/2 of HV_HYP_PAGE_SIZE is to
+  * send endpoint interrupts, and the other is to receive endpoint interrupts.
   */
- #define MAX_NUM_CHANNELS      ((PAGE_SIZE >> 1) << 3) /* 16348 channels */
+ #define MAX_NUM_CHANNELS      ((HV_HYP_PAGE_SIZE >> 1) << 3)
  
  /* The value here must be in multiple of 32 */
  /* TODO: Need to make this configurable */