# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244024438 -3600
# Node ID 4e22d660ece3496f5df0f730c66ccea25822177a
# Parent ffcc665158ae3b942aeaf03a544bf70f05c07fcb
typo: occured -> occurred
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
docs/misc/xsm-flask.txt | 2 +-
xen/arch/x86/cpu/mcheck/mce.c | 4 ++--
xen/arch/x86/x86_32/supervisor_mode_kernel.S | 2 +-
xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h | 2 +-
xen/include/asm-ia64/linux-xen/linux/efi.h | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff -r ffcc665158ae -r 4e22d660ece3 docs/misc/xsm-flask.txt
--- a/docs/misc/xsm-flask.txt Wed Jun 03 11:19:51 2009 +0100
+++ b/docs/misc/xsm-flask.txt Wed Jun 03 11:20:38 2009 +0100
@@ -1,4 +1,4 @@ These notes are compiled from xen-devel
-These notes are compiled from xen-devel questions and postings that have
occured
+These notes are compiled from xen-devel questions and postings that have
occurred
since the inclusion of XSM. These notes are not intended to be definitive
documentation but should address many common problems that arrise when
experimenting with XSM:FLASK.
diff -r ffcc665158ae -r 4e22d660ece3 xen/arch/x86/cpu/mcheck/mce.c
--- a/xen/arch/x86/cpu/mcheck/mce.c Wed Jun 03 11:19:51 2009 +0100
+++ b/xen/arch/x86/cpu/mcheck/mce.c Wed Jun 03 11:20:38 2009 +0100
@@ -354,7 +354,7 @@ void mcheck_cmn_handler(struct cpu_user_
vcpu_schedule_unlock_irq(v);
irqlocked = 0;
- printk("Terminal machine check exception occured in "
+ printk("Terminal machine check exception occurred in "
"hypervisor context.\n");
/* If MCG_STATUS_EIPV indicates, the IP on the stack is related
@@ -666,7 +666,7 @@ void x86_mcinfo_dump(struct mc_info *mi)
mc_global->mc_coreid, mc_global->mc_gstatus);
} else {
printk(XENLOG_WARNING "MCE: The hardware reports a non "
- "fatal, correctable incident occured on "
+ "fatal, correctable incident occurred on "
"CPU %d.\n",
mc_global->mc_coreid);
}
diff -r ffcc665158ae -r 4e22d660ece3
xen/arch/x86/x86_32/supervisor_mode_kernel.S
--- a/xen/arch/x86/x86_32/supervisor_mode_kernel.S Wed Jun 03 11:19:51
2009 +0100
+++ b/xen/arch/x86/x86_32/supervisor_mode_kernel.S Wed Jun 03 11:20:38
2009 +0100
@@ -98,7 +98,7 @@ ENTRY(fixup_ring0_guest_stack)
addl $((6+4)*4),%esi
# %gs:%esi now points to the guest stack before the
- # interrupt/exception occured.
+ # interrupt/exception occurred.
movl $PER_CPU_GDT_ENTRY*8,%ecx
lsll %ecx,%ecx
diff -r ffcc665158ae -r 4e22d660ece3
xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h
--- a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h Wed Jun 03
11:19:51 2009 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h Wed Jun 03
11:20:38 2009 +0100
@@ -67,7 +67,7 @@ typedef struct {
unsigned long ip; /* where did the overflow
interrupt happened */
unsigned long tstamp; /* ar.itc when entering
perfmon intr. handler */
- unsigned short cpu; /* cpu on which the overfow
occured */
+ unsigned short cpu; /* cpu on which the overfow
occurred */
unsigned short set; /* event set active when
overflow ocurred */
int tgid; /* thread group id (for
NPTL, this is getpid()) */
} pfm_default_smpl_entry_t;
diff -r ffcc665158ae -r 4e22d660ece3 xen/include/asm-ia64/linux-xen/linux/efi.h
--- a/xen/include/asm-ia64/linux-xen/linux/efi.h Wed Jun 03 11:19:51
2009 +0100
+++ b/xen/include/asm-ia64/linux-xen/linux/efi.h Wed Jun 03 11:20:38
2009 +0100
@@ -469,7 +469,7 @@ struct efi_generic_dev_path {
/* rr7 (and rr6) may already be set to XEN_EFI_RR7 (and XEN_EFI_RR6), which
* would indicate a nested EFI, SAL or PAL call, such
- * as from an MCA. This may have occured during a call
+ * as from an MCA. This may have occurred during a call
* to set_one_rr_efi(). To be safe, repin everything anyway.
*/
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home