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

[mirror_ubuntu-artful-kernel.git] / drivers / hv / channel.c

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 321b8833fa6f35a5a1941d319816ed2ffc83a6d2..736ac76d2a6a3d06f8ac750a273a56dfc9e2abd3 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -333,7 +333,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,
                         * Gpadl is u32 and we are using a pointer which could
                         * be 64-bit
                         * This is governed by the guest/host protocol and
-                        * so the hypervisor gurantees that this is ok.
+                        * so the hypervisor guarantees that this is ok.
                         */
                        for (i = 0; i < pfncurr; i++)
                                gpadl_body->pfn[i] = slow_virt_to_phys(
@@ -380,7 +380,7 @@ nomem:
 }
 
 /*
- * vmbus_establish_gpadl - Estabish a GPADL for the specified buffer
+ * vmbus_establish_gpadl - Establish a GPADL for the specified buffer
  *
  * @channel: a channel
  * @kbuffer: from kmalloc or vmalloc
@@ -731,7 +731,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
        /* Setup the descriptor */
        desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
        desc.flags = flags;
-       desc.dataoffset8 = descsize >> 3; /* in 8-bytes grandularity */
+       desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */
        desc.length8 = (u16)(packetlen_aligned >> 3);
        desc.transactionid = requestid;
        desc.rangecount = pagecount;
@@ -792,7 +792,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
        /* Setup the descriptor */
        desc->type = VM_PKT_DATA_USING_GPA_DIRECT;
        desc->flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
-       desc->dataoffset8 = desc_size >> 3; /* in 8-bytes grandularity */
+       desc->dataoffset8 = desc_size >> 3; /* in 8-bytes granularity */
        desc->length8 = (u16)(packetlen_aligned >> 3);
        desc->transactionid = requestid;
        desc->rangecount = 1;
@@ -842,7 +842,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
        /* Setup the descriptor */
        desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
        desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
-       desc.dataoffset8 = descsize >> 3; /* in 8-bytes grandularity */
+       desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */
        desc.length8 = (u16)(packetlen_aligned >> 3);
        desc.transactionid = requestid;
        desc.rangecount = 1;