From: Borislav Petkov <bp@alien8.de>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Borislav Petkov <bp@suse.de>
Subject: [PATCH 4/4] x86, CPU, AMD: Drop useless label
Date: Mon, 8 Apr 2013 17:57:46 +0200 [thread overview]
Message-ID: <1365436666-9837-5-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1365436666-9837-1-git-send-email-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
All we want to do is return from this function so stop jumping around
like a flea for no good reason.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/cpu/amd.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index cea02d703bca..5013a48d1aff 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
/* Athlon 660/661 is valid. */
if ((c->x86_model == 6) && ((c->x86_mask == 0) ||
(c->x86_mask == 1)))
- goto valid_k7;
+ return;
/* Duron 670 is valid */
if ((c->x86_model == 7) && (c->x86_mask == 0))
- goto valid_k7;
+ return;
/*
* Athlon 662, Duron 671, and Athlon >model 7 have capability
@@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
((c->x86_model == 7) && (c->x86_mask >= 1)) ||
(c->x86_model > 7))
if (cpu_has_mp)
- goto valid_k7;
+ return;
/* If we get here, not a certified SMP capable AMD system. */
@@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
WARN_ONCE(1, "WARNING: This combination of AMD"
" processors is not suitable for SMP.\n");
add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
-
-valid_k7:
- ;
}
static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
--
1.8.2.135.g7b592fa
next prev parent reply other threads:[~2013-04-08 15:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 15:57 [PATCH 0/4] x86: FPU detection in C Borislav Petkov
2013-04-08 15:57 ` [PATCH 1/4] x86: Get rid of ->hard_math and all the FPU asm fu Borislav Petkov
2013-04-08 16:26 ` [tip:x86/cpu] " tip-bot for H. Peter Anvin
2013-06-12 20:48 ` [tip:x86/fpu] " tip-bot for H. Peter Anvin
2013-04-08 15:57 ` [PATCH 2/4] x86: Fold-in trivial check_config function Borislav Petkov
2013-04-08 16:27 ` [tip:x86/cpu] " tip-bot for Borislav Petkov
2013-04-16 13:51 ` tip-bot for Borislav Petkov
2013-04-08 15:57 ` [PATCH 3/4] x86, AMD: Correct {rd,wr}msr_amd_safe warnings Borislav Petkov
2013-04-08 16:28 ` [tip:x86/cpu] " tip-bot for Borislav Petkov
2013-04-16 13:53 ` tip-bot for Borislav Petkov
2013-04-08 15:57 ` Borislav Petkov [this message]
2013-04-08 16:29 ` [tip:x86/cpu] x86, CPU, AMD: Drop useless label tip-bot for Borislav Petkov
2013-04-16 13:54 ` tip-bot for Borislav Petkov
2013-04-10 11:08 ` [PATCH 0/4] x86: FPU detection in C Ingo Molnar
2013-04-10 12:24 ` Borislav Petkov
2013-04-10 12:25 ` Ingo Molnar
2013-04-10 13:32 ` Borislav Petkov
2013-04-10 15:35 ` H. Peter Anvin
2013-04-10 16:11 ` Borislav Petkov
2013-04-10 21:29 ` [PATCH] x86, FPU: Fix FPU initialization Borislav Petkov
2013-04-11 12:09 ` Ingo Molnar
2013-04-11 14:23 ` Borislav Petkov
2013-04-11 19:26 ` H. Peter Anvin
2013-04-11 20:23 ` Borislav Petkov
2013-04-12 5:32 ` Ingo Molnar
2013-04-12 5:34 ` H. Peter Anvin
2013-04-12 9:47 ` Borislav Petkov
2013-04-12 11:26 ` Borislav Petkov
2013-04-15 10:08 ` Ingo Molnar
2013-04-15 10:17 ` Borislav Petkov
2013-04-15 10:18 ` Ingo Molnar
2013-04-15 15:54 ` Borislav Petkov
2013-04-15 22:04 ` Borislav Petkov
2013-04-16 9:25 ` Ingo Molnar
2013-04-16 9:48 ` Borislav Petkov
2013-04-16 10:08 ` [GIT PULL] Rebase tip:x86/cpu Borislav Petkov
2013-04-16 11:35 ` Ingo Molnar
2013-04-16 11:33 ` [PATCH] x86, FPU: Fix FPU initialization Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2013-04-29 14:04 [PATCH 0/3] FPU detection in C, second try Borislav Petkov
2013-04-29 14:04 ` [PATCH 1/3] x86: Get rid of ->hard_math and all the FPU asm fu Borislav Petkov
2013-04-29 14:04 ` [PATCH 2/3] x86: Sanity-check static_cpu_has usage Borislav Petkov
2013-04-29 15:38 ` H. Peter Anvin
2013-04-29 14:04 ` [PATCH 3/3] x86, FPU: Do not use static_cpu_has before alternatives Borislav Petkov
2013-04-29 15:42 ` H. Peter Anvin
2013-04-29 18:51 ` Borislav Petkov
2013-04-29 18:58 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365436666-9837-5-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.