diff options
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 64ce58bee6f5..d6d630d31ef3 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -471,6 +471,7 @@ extern enum system_states { | |||
471 | #define TAINT_OOT_MODULE 12 | 471 | #define TAINT_OOT_MODULE 12 |
472 | #define TAINT_UNSIGNED_MODULE 13 | 472 | #define TAINT_UNSIGNED_MODULE 13 |
473 | #define TAINT_SOFTLOCKUP 14 | 473 | #define TAINT_SOFTLOCKUP 14 |
474 | #define TAINT_LIVEPATCH 15 | ||
474 | 475 | ||
475 | extern const char hex_asc[]; | 476 | extern const char hex_asc[]; |
476 | #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] | 477 | #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] |
@@ -799,9 +800,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } | |||
799 | const typeof( ((type *)0)->member ) *__mptr = (ptr); \ | 800 | const typeof( ((type *)0)->member ) *__mptr = (ptr); \ |
800 | (type *)( (char *)__mptr - offsetof(type,member) );}) | 801 | (type *)( (char *)__mptr - offsetof(type,member) );}) |
801 | 802 | ||
802 | /* Trap pasters of __FUNCTION__ at compile-time */ | ||
803 | #define __FUNCTION__ (__func__) | ||
804 | |||
805 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ | 803 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ |
806 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | 804 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD |
807 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | 805 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |