diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 17:28:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 17:28:32 -0800 |
| commit | d4a2e61f0b7a7b5b9e321e776a1e874c02e847e4 (patch) | |
| tree | d90b71a99cb82809d56f9798f59d175b57562803 /kernel/panic.c | |
| parent | 0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c (diff) | |
| parent | 2449b8ba0745327c5fa49a8d9acffe03b2eded69 (diff) | |
| download | op-kernel-dev-d4a2e61f0b7a7b5b9e321e776a1e874c02e847e4.zip op-kernel-dev-d4a2e61f0b7a7b5b9e321e776a1e874c02e847e4.tar.gz | |
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 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index d7bb697..b2659360 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -177,6 +177,7 @@ static const struct tnt tnts[] = { { TAINT_WARN, 'W', ' ' }, { TAINT_CRAP, 'C', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, + { TAINT_OOT_MODULE, 'O', ' ' }, }; /** @@ -194,6 +195,7 @@ static const struct tnt tnts[] = { * 'W' - Taint on warning. * 'C' - modules from drivers/staging are loaded. * 'I' - Working around severe firmware bug. + * 'O' - Out-of-tree module has been loaded. * * The string is overwritten by the next call to print_tainted(). */ |
