summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-17 14:49:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-17 14:49:21 -0800
commit0aa0313f9d576affd7747cc3f179feb097d28990 (patch)
tree51a0dd43d162bced8b68ebb91e63772451a293f8 /kernel
parent4b19a9e20bf99d62e1c47554f8eb2d9f520642ba (diff)
parent5eb7c0d04f04a667c049fe090a95494a8de2955c (diff)
downloadlinux-stable-0aa0313f9d576affd7747cc3f179feb097d28990.tar.gz
linux-stable-0aa0313f9d576affd7747cc3f179feb097d28990.tar.bz2
linux-stable-0aa0313f9d576affd7747cc3f179feb097d28990.zip
Merge tag 'modules-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules fix from Jessica Yu: - fix out-of-tree module breakage when it supplies its own definitions of true and false * tag 'modules-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux: taint/module: Fix problems when out-of-kernel driver defines true or false
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c2
-rw-r--r--kernel/panic.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 5088784c0cf9..38d4270925d4 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1145,7 +1145,7 @@ static size_t module_flags_taint(struct module *mod, char *buf)
for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
if (taint_flags[i].module && test_bit(i, &mod->taints))
- buf[l++] = taint_flags[i].true;
+ buf[l++] = taint_flags[i].c_true;
}
return l;
diff --git a/kernel/panic.c b/kernel/panic.c
index c51edaa04fce..901c4fb46002 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -355,7 +355,7 @@ const char *print_tainted(void)
for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
const struct taint_flag *t = &taint_flags[i];
*s++ = test_bit(i, &tainted_mask) ?
- t->true : t->false;
+ t->c_true : t->c_false;
}
*s = 0;
} else