aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2014-03-31 00:09:57 -0400
committerRusty Russell <rusty@rustcorp.com.au>2014-03-31 00:22:43 -0400
commit57673c2b0baa900dddae3b9eb3d7748ebf550eb3 (patch)
tree8d485d6427d818f61b4c95945925b6c0235a3f50 /kernel
parent58f86cc89c3372d3e61d5b71e5513ec5a0b02848 (diff)
Use 'E' instead of 'X' for unsigned module taint flag.
Takashi Iwai <tiwai@suse.de> says: > The letter 'X' has been already used for SUSE kernels for very long > time, to indicate the external supported modules. Can the new flag be > changed to another letter for avoiding conflict...? > (BTW, we also use 'N' for "no support", too.) Note: this code should be cleaned up, so we don't have such maps in three places! Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c2
-rw-r--r--kernel/panic.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index c1acb0c5b637..5806e096d110 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1014,7 +1014,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
1014 if (mod->taints & (1 << TAINT_CRAP)) 1014 if (mod->taints & (1 << TAINT_CRAP))
1015 buf[l++] = 'C'; 1015 buf[l++] = 'C';
1016 if (mod->taints & (1 << TAINT_UNSIGNED_MODULE)) 1016 if (mod->taints & (1 << TAINT_UNSIGNED_MODULE))
1017 buf[l++] = 'X'; 1017 buf[l++] = 'E';
1018 /* 1018 /*
1019 * TAINT_FORCED_RMMOD: could be added. 1019 * TAINT_FORCED_RMMOD: could be added.
1020 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't 1020 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
diff --git a/kernel/panic.c b/kernel/panic.c
index 0e25fe10871e..02b6c9f0171b 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -210,7 +210,7 @@ static const struct tnt tnts[] = {
210 { TAINT_CRAP, 'C', ' ' }, 210 { TAINT_CRAP, 'C', ' ' },
211 { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, 211 { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' },
212 { TAINT_OOT_MODULE, 'O', ' ' }, 212 { TAINT_OOT_MODULE, 'O', ' ' },
213 { TAINT_UNSIGNED_MODULE, 'X', ' ' }, 213 { TAINT_UNSIGNED_MODULE, 'E', ' ' },
214}; 214};
215 215
216/** 216/**
@@ -229,7 +229,7 @@ static const struct tnt tnts[] = {
229 * 'C' - modules from drivers/staging are loaded. 229 * 'C' - modules from drivers/staging are loaded.
230 * 'I' - Working around severe firmware bug. 230 * 'I' - Working around severe firmware bug.
231 * 'O' - Out-of-tree module has been loaded. 231 * 'O' - Out-of-tree module has been loaded.
232 * 'X' - Unsigned module has been loaded. 232 * 'E' - Unsigned module has been loaded.
233 * 233 *
234 * The string is overwritten by the next call to print_tainted(). 234 * The string is overwritten by the next call to print_tainted().
235 */ 235 */