Various: Fix typo `occured'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Gbp-Pq: Name 0004-Various-Fix-typo-occured.patch

diff --git a/tools/xl/xl_flask.c b/tools/xl/xl_flask.c
index 523769750bfd11575759a67c0eeea27c228a740d..6b11f091cc40209d78fc83024b6ad6140438a3bd 100644 (file)
--- a/tools/xl/xl_flask.c
+++ b/tools/xl/xl_flask.c
@@ -75,7 +75,7 @@ int main_setenforce(int argc, char **argv)
             fprintf(stderr, "Flask XSM disabled\n");
         }
         else
-            fprintf(stderr, "error occured while setting enforcing mode (%i)\n", ret);
+            fprintf(stderr, "error occurred while setting enforcing mode (%i)\n", ret);
     }
 
     return ret;

diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S
index 2eb81565ef603c8d41063e2460f2449767b1ec2d..87c2537ffeb7cc8c2eeeabfd47eb573cc41f064b 100644 (file)
--- a/xen/arch/arm/arm64/lib/memcmp.S
+++ b/xen/arch/arm/arm64/lib/memcmp.S
@@ -210,7 +210,7 @@ CPU_LE( lsr tmp2, tmp2, tmp1 )
 .Lunequal_proc:
        cbz     diff, .Lremain8
 
-/*There is differnence occured in the latest comparison.*/
+/*There is differnence occurred in the latest comparison.*/
 .Lnot_limit:
 /*
 * For little endian,reverse the low significant equal bits into MSB,then

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 07a412a829316aeeda1fc8474dd2aa438a24c2e9..fd568f66528c53f191dca650ac7e4a64ba05d69b 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1743,7 +1743,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla,
         case NESTEDHVM_PAGEFAULT_RETRY:
             return 1;
         case NESTEDHVM_PAGEFAULT_L1_ERROR:
-            /* An error occured while translating gpa from
+            /* An error occurred while translating gpa from
              * l2 guest address to l1 guest address. */
             return 0;
         case NESTEDHVM_PAGEFAULT_INJECT:

diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c
index 8511ff0b704181b4994f6124b829c9f6b9244b0c..b000cdf8839384b44cf31b83db960a9450e39828 100644 (file)
--- a/xen/arch/x86/hvm/svm/intr.c
+++ b/xen/arch/x86/hvm/svm/intr.c
@@ -159,7 +159,7 @@ void svm_intr_assist(void)
             int rc;
 
             /* l2 guest was running when an interrupt for
-             * the l1 guest occured.
+             * the l1 guest occurred.
              */
             rc = nestedsvm_vcpu_interrupt(v, intack);
             switch (rc) {

diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
index 74c09b0991884ec7854dc3c9d764618f5b18ff19..4853cf1022ffd46d2d71c73d432605777c75b1f3 100644 (file)
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -2278,7 +2278,7 @@ MODULE_DEVICE_TABLE(of, arm_smmu_of_match);
 
 /*
  * Xen: We don't have refcount for allocated memory so manually free memory
- * when an error occured.
+ * when an error occurred.
  */
 static int arm_smmu_device_dt_probe(struct platform_device *pdev)
 {

diff --git a/xen/include/efi/efiprot.h b/xen/include/efi/efiprot.h
index 05d3afb8d9ba7ac294895efaef7618712f49bb67..8cf04df43721ddc64eb73f14f659686b724c658d 100644 (file)
--- a/xen/include/efi/efiprot.h
+++ b/xen/include/efi/efiprot.h
@@ -691,7 +691,7 @@ typedef enum {
 
   @retval EFI_SUCCESS           The Blt operation completed.
   @retval EFI_INVALID_PARAMETER BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR      A hardware error occured writting to the video buffer.
+  @retval EFI_DEVICE_ERROR      A hardware error occurred writting to the video buffer.
 
 **/
 typedef

diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index 6c180c45eba720e5c65b8746cd32e54560d47e42..5a5a2fb48a8fe5ba0053b1369447e764d6ce533e 100644 (file)
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -177,7 +177,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
 #define VIRQ_XENOPROF   7  /* V. XenOprofile interrupt: new sample available */
 #define VIRQ_CON_RING   8  /* G. (DOM0) Bytes received on console            */
 #define VIRQ_PCPU_STATE 9  /* G. (DOM0) PCPU state changed                   */
-#define VIRQ_MEM_EVENT  10 /* G. (DOM0) A memory event has occured           */
+#define VIRQ_MEM_EVENT  10 /* G. (DOM0) A memory event has occurred          */
 #define VIRQ_XC_RESERVED 11 /* G. Reserved for XenClient                     */
 #define VIRQ_ENOMEM     12 /* G. (DOM0) Low on heap memory       */
 #define VIRQ_XENPMU     13 /* V.  PMC interrupt                              */

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 81af1209dda87ccdaf9df72044b815d5e8cd26fa..98c58c8a1cbbd4585da6bb4d7288dd01502588c9 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -640,7 +640,7 @@ void noreturn __domain_crash_synchronous(void);
 
 /*
  * Called from assembly code, with an optional address to help indicate why
- * the crash occured.  If addr is 0, look up address from last extable
+ * the crash occurred.  If addr is 0, look up address from last extable
  * redirection.
  */
 void noreturn asm_domain_crash_synchronous(unsigned long addr);