From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, bp@suse.de
Subject: [tip:x86/cpu] x86: Fold-in trivial check_config function
Date: Mon, 8 Apr 2013 09:27:21 -0700 [thread overview]
Message-ID: <tip-e277a49385743dfa69a7adbb1ff19732d83d258c@git.kernel.org> (raw)
In-Reply-To: <1365436666-9837-3-git-send-email-bp@alien8.de>
Commit-ID: e277a49385743dfa69a7adbb1ff19732d83d258c
Gitweb: http://git.kernel.org/tip/e277a49385743dfa69a7adbb1ff19732d83d258c
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Apr 2013 17:57:44 +0200
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 8 Apr 2013 09:07:17 -0700
x86: Fold-in trivial check_config function
Fold it into its single call site. No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1365436666-9837-3-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/cpu/bugs.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index efa24c0..0344534 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -63,21 +63,6 @@ static void __init check_fpu(void)
}
}
-/*
- * Check whether we are able to run this kernel safely on SMP.
- *
- * - i386 is no longer supported.
- * - In order to run on anything without a TSC, we need to be
- * compiled for a i486.
- */
-
-static void __init check_config(void)
-{
- if (boot_cpu_data.x86 < 4)
- panic("Kernel requires i486+ for 'invlpg' and other features");
-}
-
-
void __init check_bugs(void)
{
identify_boot_cpu();
@@ -85,7 +70,17 @@ void __init check_bugs(void)
pr_info("CPU: ");
print_cpu_info(&boot_cpu_data);
#endif
- check_config();
+
+ /*
+ * Check whether we are able to run this kernel safely on SMP.
+ *
+ * - i386 is no longer supported.
+ * - In order to run on anything without a TSC, we need to be
+ * compiled for a i486.
+ */
+ if (boot_cpu_data.x86 < 4)
+ panic("Kernel requires i486+ for 'invlpg' and other features");
+
init_utsname()->machine[1] =
'0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
alternative_instructions();
next prev parent reply other threads:[~2013-04-08 16:28 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-bot for Borislav Petkov [this message]
2013-04-16 13:51 ` [tip:x86/cpu] " 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 ` [PATCH 4/4] x86, CPU, AMD: Drop useless label Borislav Petkov
2013-04-08 16:29 ` [tip:x86/cpu] " 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
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=tip-e277a49385743dfa69a7adbb1ff19732d83d258c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).