diff options
| author | Andi Kleen | 2009-05-27 21:56:53 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2009-05-28 18:24:15 +0200 |
| commit | 32561696c23028596f24b353d98f2e23b58f91f7 (patch) | |
| tree | 84043f949c1fe376aca91cdf167d0ddc0d1aeba9 /arch/x86/kernel/cpu/mcheck/mce.c | |
| parent | x86, mce: remove mce_init unused argument (diff) | |
| download | kernel-qcow2-linux-32561696c23028596f24b353d98f2e23b58f91f7.tar.gz kernel-qcow2-linux-32561696c23028596f24b353d98f2e23b58f91f7.tar.xz kernel-qcow2-linux-32561696c23028596f24b353d98f2e23b58f91f7.zip | |
x86, mce: rename and align out2 label
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>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 20c7e7c669d2..18d505d80221 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -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(); } |