From: tip-bot for Dave Jones <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
davej@fedoraproject.org, davej@redhat.com, tglx@linutronix.de
Subject: [tip:x86/cpu] Rename TAINT_UNSAFE_SMP to TAINT_CPU_OUT_OF_SPEC
Date: Thu, 20 Mar 2014 16:30:35 -0700 [thread overview]
Message-ID: <tip-8c90487cdc64847b4fdd812ab3047f426fec4d13@git.kernel.org> (raw)
In-Reply-To: <20140226154949.GA770@redhat.com>
Commit-ID: 8c90487cdc64847b4fdd812ab3047f426fec4d13
Gitweb: http://git.kernel.org/tip/8c90487cdc64847b4fdd812ab3047f426fec4d13
Author: Dave Jones <davej@redhat.com>
AuthorDate: Wed, 26 Feb 2014 10:49:49 -0500
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Thu, 20 Mar 2014 16:28:09 -0700
Rename TAINT_UNSAFE_SMP to TAINT_CPU_OUT_OF_SPEC
Rename TAINT_UNSAFE_SMP to TAINT_CPU_OUT_OF_SPEC, so we can repurpose
the flag to encompass a wider range of pushing the CPU beyond its
warrany.
Signed-off-by: Dave Jones <davej@fedoraproject.org>
Link: http://lkml.kernel.org/r/20140226154949.GA770@redhat.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/cpu/amd.c | 2 +-
include/linux/kernel.h | 2 +-
kernel/module.c | 2 +-
kernel/panic.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index b85e43a..ce8b8ff 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -218,7 +218,7 @@ static void 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);
+ add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_NOW_UNRELIABLE);
}
static void init_amd_k7(struct cpuinfo_x86 *c)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 196d1ea..08fb024 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -458,7 +458,7 @@ extern enum system_states {
#define TAINT_PROPRIETARY_MODULE 0
#define TAINT_FORCED_MODULE 1
-#define TAINT_UNSAFE_SMP 2
+#define TAINT_CPU_OUT_OF_SPEC 2
#define TAINT_FORCED_RMMOD 3
#define TAINT_MACHINE_CHECK 4
#define TAINT_BAD_PAGE 5
diff --git a/kernel/module.c b/kernel/module.c
index d24fcf2..ca2c1ad 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1015,7 +1015,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
buf[l++] = 'C';
/*
* TAINT_FORCED_RMMOD: could be added.
- * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
+ * TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
* apply to modules.
*/
return l;
diff --git a/kernel/panic.c b/kernel/panic.c
index 6d63003..2270cfd 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -199,7 +199,7 @@ struct tnt {
static const struct tnt tnts[] = {
{ TAINT_PROPRIETARY_MODULE, 'P', 'G' },
{ TAINT_FORCED_MODULE, 'F', ' ' },
- { TAINT_UNSAFE_SMP, 'S', ' ' },
+ { TAINT_CPU_OUT_OF_SPEC, 'S', ' ' },
{ TAINT_FORCED_RMMOD, 'R', ' ' },
{ TAINT_MACHINE_CHECK, 'M', ' ' },
{ TAINT_BAD_PAGE, 'B', ' ' },
next prev parent reply other threads:[~2014-03-20 23:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 6:01 [PATCH] x86: set Pentium M as PAE capable Chris Bainbridge
2014-02-25 10:45 ` H. Peter Anvin
2014-02-25 11:35 ` Borislav Petkov
2014-02-25 12:06 ` Peter Hurley
2014-02-25 12:07 ` One Thousand Gnomes
2014-02-25 16:26 ` Dave Jones
2014-02-25 17:16 ` H. Peter Anvin
2014-02-26 12:12 ` Chris Bainbridge
2014-02-26 13:18 ` Borislav Petkov
2014-02-26 15:49 ` Dave Jones
2014-02-26 17:18 ` Borislav Petkov
2014-02-26 17:20 ` Dave Jones
2014-02-26 17:28 ` Borislav Petkov
2014-02-28 7:30 ` Chris Bainbridge
[not found] ` <CAKKYfmFgVjYwvThpB0FBB+ggOwULWKLpz7ADT1eojno_KtD9yw@mail.gmail.com>
2014-02-28 14:00 ` Chris Bainbridge
2014-03-02 20:56 ` Andreas Mohr
2014-03-02 20:59 ` H. Peter Anvin
2014-03-02 21:02 ` Dave Jones
2014-03-02 21:04 ` Borislav Petkov
2014-03-02 21:13 ` Andreas Mohr
2014-03-02 21:42 ` Gene Heskett
2014-03-03 12:31 ` One Thousand Gnomes
2014-03-03 8:04 ` Chris Bainbridge
2014-03-03 19:29 ` Borislav Petkov
2014-03-04 5:01 ` Chris Bainbridge
2014-03-04 5:04 ` H. Peter Anvin
2014-03-04 6:06 ` Chris Bainbridge
2014-03-04 10:44 ` Borislav Petkov
2014-03-05 4:17 ` Chris Bainbridge
2014-03-07 11:40 ` [PATCH] x86: Add forcepae parameter for booting PAE kernels on PAE-disabled Pentium M Chris Bainbridge
2014-03-10 10:25 ` Borislav Petkov
2014-03-20 23:30 ` [tip:x86/cpu] x86, cpu: " tip-bot for Chris Bainbridge
2014-03-20 23:33 ` tip-bot for Chris Bainbridge
2014-03-20 23:30 ` tip-bot for Dave Jones [this message]
2014-02-26 16:46 ` [PATCH] x86: set Pentium M as PAE capable H. Peter Anvin
2014-02-26 16:44 ` Matthew Garrett
2014-02-26 16:45 ` H. Peter Anvin
2014-02-26 17:10 ` Matthew Garrett
2014-02-26 17:57 ` H. Peter Anvin
2014-03-03 0:11 ` 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-8c90487cdc64847b4fdd812ab3047f426fec4d13@git.kernel.org \
--to=tipbot@zytor.com \
--cc=davej@fedoraproject.org \
--cc=davej@redhat.com \
--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
Powered by JetHome