x86, mce: rename and align out2 label
authorAndi Kleen <andi@firstfloor.org>
Wed, 27 May 2009 19:56:53 +0000 (21:56 +0200)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 28 May 2009 16:24:15 +0000 (09:24 -0700)
There's only a single out path in do_machine_check now, so rename the
label from out2 to out.  Also align it at the first column.

[ Impact: minor cleanup, no functional changes ]

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/kernel/cpu/mcheck/mce.c

index 20c7e7c669d27b0b3dc14ca24b9a68fa1c25ce43..18d505d802214ac2334320ddfb7d2f08cef0afc4 100644 (file)
@@ -361,9 +361,9 @@ void do_machine_check(struct pt_regs *regs, long error_code)
 
        if (notify_die(DIE_NMI, "machine check", regs, error_code,
                           18, SIGKILL) == NOTIFY_STOP)
-               goto out2;
+               goto out;
        if (!banks)
-               goto out2;
+               goto out;
 
        mce_setup(&m);
 
@@ -499,7 +499,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
                        mce_wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0);
        }
        mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
- out2:
+out:
        atomic_dec(&mce_entry);
        sync_core();
 }