diff options
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 | ||||
-rw-r--r-- | include/linux/kernel.h | 2 | ||||
-rw-r--r-- | kernel/module.c | 2 | ||||
-rw-r--r-- | 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 b85e43a5a462..ce8b8ff0e0ef 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) | |||
218 | */ | 218 | */ |
219 | WARN_ONCE(1, "WARNING: This combination of AMD" | 219 | WARN_ONCE(1, "WARNING: This combination of AMD" |
220 | " processors is not suitable for SMP.\n"); | 220 | " processors is not suitable for SMP.\n"); |
221 | add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE); | 221 | add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_NOW_UNRELIABLE); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void init_amd_k7(struct cpuinfo_x86 *c) | 224 | static void init_amd_k7(struct cpuinfo_x86 *c) |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 196d1ea86df0..08fb02477641 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -458,7 +458,7 @@ extern enum system_states { | |||
458 | 458 | ||
459 | #define TAINT_PROPRIETARY_MODULE 0 | 459 | #define TAINT_PROPRIETARY_MODULE 0 |
460 | #define TAINT_FORCED_MODULE 1 | 460 | #define TAINT_FORCED_MODULE 1 |
461 | #define TAINT_UNSAFE_SMP 2 | 461 | #define TAINT_CPU_OUT_OF_SPEC 2 |
462 | #define TAINT_FORCED_RMMOD 3 | 462 | #define TAINT_FORCED_RMMOD 3 |
463 | #define TAINT_MACHINE_CHECK 4 | 463 | #define TAINT_MACHINE_CHECK 4 |
464 | #define TAINT_BAD_PAGE 5 | 464 | #define TAINT_BAD_PAGE 5 |
diff --git a/kernel/module.c b/kernel/module.c index d24fcf29cb64..ca2c1aded7ee 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -1015,7 +1015,7 @@ static size_t module_flags_taint(struct module *mod, char *buf) | |||
1015 | buf[l++] = 'C'; | 1015 | buf[l++] = 'C'; |
1016 | /* | 1016 | /* |
1017 | * TAINT_FORCED_RMMOD: could be added. | 1017 | * TAINT_FORCED_RMMOD: could be added. |
1018 | * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't | 1018 | * TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't |
1019 | * apply to modules. | 1019 | * apply to modules. |
1020 | */ | 1020 | */ |
1021 | return l; | 1021 | return l; |
diff --git a/kernel/panic.c b/kernel/panic.c index 6d6300375090..2270cfd1d6be 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -199,7 +199,7 @@ struct tnt { | |||
199 | static const struct tnt tnts[] = { | 199 | static const struct tnt tnts[] = { |
200 | { TAINT_PROPRIETARY_MODULE, 'P', 'G' }, | 200 | { TAINT_PROPRIETARY_MODULE, 'P', 'G' }, |
201 | { TAINT_FORCED_MODULE, 'F', ' ' }, | 201 | { TAINT_FORCED_MODULE, 'F', ' ' }, |
202 | { TAINT_UNSAFE_SMP, 'S', ' ' }, | 202 | { TAINT_CPU_OUT_OF_SPEC, 'S', ' ' }, |
203 | { TAINT_FORCED_RMMOD, 'R', ' ' }, | 203 | { TAINT_FORCED_RMMOD, 'R', ' ' }, |
204 | { TAINT_MACHINE_CHECK, 'M', ' ' }, | 204 | { TAINT_MACHINE_CHECK, 'M', ' ' }, |
205 | { TAINT_BAD_PAGE, 'B', ' ' }, | 205 | { TAINT_BAD_PAGE, 'B', ' ' }, |