summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 17:28:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 17:28:32 -0800
commitd4a2e61f0b7a7b5b9e321e776a1e874c02e847e4 (patch)
treed90b71a99cb82809d56f9798f59d175b57562803 /include/linux
parent0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c (diff)
parent2449b8ba0745327c5fa49a8d9acffe03b2eded69 (diff)
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux: module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree module: Enable dynamic debugging regardless of taint
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kernel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4c0d3b2fd5f..e8b1597b5cf 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -371,6 +371,7 @@ extern enum system_states {
#define TAINT_WARN 9
#define TAINT_CRAP 10
#define TAINT_FIRMWARE_WORKAROUND 11
+#define TAINT_OOT_MODULE 12
extern const char hex_asc[];
#define hex_asc_lo(x) hex_asc[((x) & 0x0f)]