ia64/xen-unstable

changeset 19705:4e22d660ece3

typo: occured -> occurred

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jun 03 11:20:38 2009 +0100 (2009-06-03)
parents ffcc665158ae
children 49e8816db57a
files docs/misc/xsm-flask.txt xen/arch/x86/cpu/mcheck/mce.c xen/arch/x86/x86_32/supervisor_mode_kernel.S xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h xen/include/asm-ia64/linux-xen/linux/efi.h
line diff
     1.1 --- a/docs/misc/xsm-flask.txt	Wed Jun 03 11:19:51 2009 +0100
     1.2 +++ b/docs/misc/xsm-flask.txt	Wed Jun 03 11:20:38 2009 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -These notes are compiled from xen-devel questions and postings that have occured
     1.5 +These notes are compiled from xen-devel questions and postings that have occurred
     1.6  since the inclusion of XSM.  These notes are not intended to be definitive
     1.7  documentation but should address many common problems that arrise when
     1.8  experimenting with XSM:FLASK.
     2.1 --- a/xen/arch/x86/cpu/mcheck/mce.c	Wed Jun 03 11:19:51 2009 +0100
     2.2 +++ b/xen/arch/x86/cpu/mcheck/mce.c	Wed Jun 03 11:20:38 2009 +0100
     2.3 @@ -354,7 +354,7 @@ void mcheck_cmn_handler(struct cpu_user_
     2.4  		vcpu_schedule_unlock_irq(v);
     2.5  		irqlocked = 0;
     2.6  
     2.7 -		printk("Terminal machine check exception occured in "
     2.8 +		printk("Terminal machine check exception occurred in "
     2.9  		    "hypervisor context.\n");
    2.10  
    2.11  		/* If MCG_STATUS_EIPV indicates, the IP on the stack is related
    2.12 @@ -666,7 +666,7 @@ void x86_mcinfo_dump(struct mc_info *mi)
    2.13  			mc_global->mc_coreid, mc_global->mc_gstatus);
    2.14  	} else {
    2.15  		printk(XENLOG_WARNING "MCE: The hardware reports a non "
    2.16 -			"fatal, correctable incident occured on "
    2.17 +			"fatal, correctable incident occurred on "
    2.18  			"CPU %d.\n",
    2.19  			mc_global->mc_coreid);
    2.20  	}
     3.1 --- a/xen/arch/x86/x86_32/supervisor_mode_kernel.S	Wed Jun 03 11:19:51 2009 +0100
     3.2 +++ b/xen/arch/x86/x86_32/supervisor_mode_kernel.S	Wed Jun 03 11:20:38 2009 +0100
     3.3 @@ -98,7 +98,7 @@ ENTRY(fixup_ring0_guest_stack)
     3.4          addl $((6+4)*4),%esi
     3.5  
     3.6          # %gs:%esi now points to the guest stack before the
     3.7 -        # interrupt/exception occured.
     3.8 +        # interrupt/exception occurred.
     3.9  
    3.10          movl  $PER_CPU_GDT_ENTRY*8,%ecx
    3.11          lsll  %ecx,%ecx
     4.1 --- a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h	Wed Jun 03 11:19:51 2009 +0100
     4.2 +++ b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h	Wed Jun 03 11:20:38 2009 +0100
     4.3 @@ -67,7 +67,7 @@ typedef struct {
     4.4          unsigned long   ip;                     /* where did the overflow interrupt happened  */
     4.5          unsigned long   tstamp;                 /* ar.itc when entering perfmon intr. handler */
     4.6  
     4.7 -        unsigned short  cpu;                    /* cpu on which the overfow occured */
     4.8 +        unsigned short  cpu;                    /* cpu on which the overfow occurred */
     4.9          unsigned short  set;                    /* event set active when overflow ocurred   */
    4.10          int    		tgid;              	/* thread group id (for NPTL, this is getpid()) */
    4.11  } pfm_default_smpl_entry_t;
     5.1 --- a/xen/include/asm-ia64/linux-xen/linux/efi.h	Wed Jun 03 11:19:51 2009 +0100
     5.2 +++ b/xen/include/asm-ia64/linux-xen/linux/efi.h	Wed Jun 03 11:20:38 2009 +0100
     5.3 @@ -469,7 +469,7 @@ struct efi_generic_dev_path {
     5.4  
     5.5  /* rr7 (and rr6) may already be set to XEN_EFI_RR7 (and XEN_EFI_RR6), which
     5.6   * would indicate a nested EFI, SAL or PAL call, such
     5.7 - * as from an MCA. This may have occured during a call
     5.8 + * as from an MCA. This may have occurred during a call
     5.9   * to set_one_rr_efi(). To be safe, repin everything anyway.
    5.10   */
    5.11