diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:50:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:50:29 +0100 |
| commit | e1b63dec2ddba654c7ca75996284e453f32d1af7 (patch) | |
| tree | c48fbfdb84b4e1b6b416b0e2ce7e14cd1350c5f5 /include/linux/kernel.h | |
| parent | f8e617f4582995f7c25ef25b4167213120ad122b (diff) | |
| parent | 746db9443ea57fd9c059f62c4bfbf41cf224fe13 (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 { #define TAINT_OOT_MODULE 12 #define TAINT_UNSIGNED_MODULE 13 #define TAINT_SOFTLOCKUP 14 +#define TAINT_LIVEPATCH 15 extern const char hex_asc[]; #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) { } const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) -/* Trap pasters of __FUNCTION__ at compile-time */ -#define __FUNCTION__ (__func__) - /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ #ifdef CONFIG_FTRACE_MCOUNT_RECORD # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |