Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6.git] / arch / x86 / kernel / mce_64.c

diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index 2cf20de5becacd82d0c57d99da467c8a43a678e9..07bbfe7aa7f70efa86fceb4adb87139296efad5c 100644 (file)
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.c
@@ -320,7 +320,7 @@ void do_machine_check(struct pt_regs * regs, long error_code)
 #ifdef CONFIG_X86_MCE_INTEL
 /***
  * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog
 #ifdef CONFIG_X86_MCE_INTEL
 /***
  * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog

- * @cpu: The CPU on which the event occured.
+ * @cpu: The CPU on which the event occurred.

  * @status: Event status information
  *
  * This function should be called by the thermal interrupt after the
  * @status: Event status information
  *
  * This function should be called by the thermal interrupt after the


@@ -688,7 +688,7 @@ static int __init mcheck_disable(char *str)
        return 1;
 }
 
        return 1;
 }
 

-/* mce=off disables machine check. Note you can reenable it later
+/* mce=off disables machine check. Note you can re-enable it later

    using sysfs.
    mce=TOLERANCELEVEL (number, see above)
    mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
    using sysfs.
    mce=TOLERANCELEVEL (number, see above)
    mce=bootlog Log MCEs from before booting. Disabled by default on AMD.