Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa0313f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4b19a9e2 5eb7c0d0

include/linux/kernel.h

+2 −2
Original line number Diff line number Diff line
@@ -514,8 +514,8 @@ extern enum system_states { 
#define TAINT_FLAGS_COUNT		16



struct taint_flag {

	char true;	/* character printed when tainted */

	char false;	/* character printed when not tainted */

	char c_true;	/* character printed when tainted */

	char c_false;	/* character printed when not tainted */

	bool module;	/* also show as a per-module taint flag */

};

kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/panic.c

+1 −1
Original line number Diff line number Diff line
@@ -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