From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, yu-cheng.yu@intel.com, gnomes@lxorguk.ukuu.org.uk,
dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org,
bp@suse.de, bp@alien8.de, mingo@kernel.org,
torvalds@linux-foundation.org, tglx@linutronix.de,
oleg@redhat.com, riel@redhat.com, peterz@infradead.org,
tedheadster@gmail.com, luto@kernel.org, fenghua.yu@intel.com,
brgerst@gmail.com
Subject: [tip:x86/fpu] x86/fpu: Fix the "Giving up, no FPU found" test
Date: Wed, 25 Jan 2017 03:43:07 -0800 [thread overview]
Message-ID: <tip-9729017f844431ab2800519297d8d1b0ecbc420d@git.kernel.org> (raw)
In-Reply-To: <1499077fa76f0f84b8ea28e37d3fa70beca4e310.1484705016.git.luto@kernel.org>
Commit-ID: 9729017f844431ab2800519297d8d1b0ecbc420d
Gitweb: http://git.kernel.org/tip/9729017f844431ab2800519297d8d1b0ecbc420d
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Wed, 18 Jan 2017 11:15:42 -0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 25 Jan 2017 10:12:44 +0100
x86/fpu: Fix the "Giving up, no FPU found" test
We would never print "Giving up, no FPU found" because
X86_FEATURE_FPU was in REQUIRED_MASK on non-FPU-emulating builds, so
the boot_cpu_has() test didn't do anything.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matthew Whitehead <tedheadster@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Link: http://lkml.kernel.org/r/1499077fa76f0f84b8ea28e37d3fa70beca4e310.1484705016.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/fpu/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 8b526c5..19bdd1b 100644
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -77,7 +77,7 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)
}
#ifndef CONFIG_MATH_EMULATION
- if (!boot_cpu_has(X86_FEATURE_FPU)) {
+ if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_FPU)) {
pr_emerg("x86/fpu: Giving up, no FPU found and no math emulation present\n");
for (;;)
asm volatile("hlt");
prev parent reply other threads:[~2017-01-25 11:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 19:15 [PATCH v2 0/6] CPUID and FPU fixes Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 1/6] x86/cpu: Add X86_FEATURE_CPUID Andy Lutomirski
2017-01-25 11:40 ` [tip:x86/fpu] " tip-bot for Borislav Petkov
2017-01-18 19:15 ` [PATCH v2 2/6] x86/cpu: Factor out application of forced cpu caps Andy Lutomirski
2017-01-25 11:40 ` [tip:x86/fpu] x86/cpu: Factor out application of forced CPU caps tip-bot for Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 3/6] x86/cpu: Re-apply forced caps every time cpu caps are re-read Andy Lutomirski
2017-01-19 11:23 ` Borislav Petkov
2017-01-25 11:41 ` [tip:x86/fpu] x86/cpu: Re-apply forced caps every time CPU " tip-bot for Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 4/6] x86/fpu: Fix "x86/fpu: Legacy x87 FPU detected" message Andy Lutomirski
2017-01-25 11:42 ` [tip:x86/fpu] " tip-bot for Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 5/6] x86/fpu: Fix CPUID-less FPU detection Andy Lutomirski
2017-01-19 11:23 ` Borislav Petkov
2017-01-25 11:42 ` [tip:x86/fpu] " tip-bot for Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 6/6] x86/fpu: Fix the "Giving up, no FPU found" test Andy Lutomirski
2017-01-25 11:43 ` tip-bot for Andy Lutomirski [this message]
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-9729017f844431ab2800519297d8d1b0ecbc420d@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tedheadster@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=yu-cheng.yu@intel.com \
/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).