tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 0aa0313f 4b19a9e2

+4 -4
+2 -2
include/linux/kernel.h
··· 514 514 #define TAINT_FLAGS_COUNT 16 515 515 516 516 struct taint_flag { 517 - char true; /* character printed when tainted */ 518 - char false; /* character printed when not tainted */ 517 + char c_true; /* character printed when tainted */ 518 + char c_false; /* character printed when not tainted */ 519 519 bool module; /* also show as a per-module taint flag */ 520 520 }; 521 521
+1 -1
kernel/module.c
··· 1145 1145 1146 1146 for (i = 0; i < TAINT_FLAGS_COUNT; i++) { 1147 1147 if (taint_flags[i].module && test_bit(i, &mod->taints)) 1148 - buf[l++] = taint_flags[i].true; 1148 + buf[l++] = taint_flags[i].c_true; 1149 1149 } 1150 1150 1151 1151 return l;
+1 -1
kernel/panic.c
··· 355 355 for (i = 0; i < TAINT_FLAGS_COUNT; i++) { 356 356 const struct taint_flag *t = &taint_flags[i]; 357 357 *s++ = test_bit(i, &tainted_mask) ? 358 - t->true : t->false; 358 + t->c_true : t->c_false; 359 359 } 360 360 *s = 0; 361 361 } else