diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-07 06:15:33 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-07 06:15:33 -0500 |
| commit | 222e82bef4bd520a31d48c31ab24e49dd46daa46 (patch) | |
| tree | b6e73cad8e0b3a1c3e1acc537789e97aadaefa92 /include/linux/kernel.h | |
| parent | 38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (diff) | |
| parent | 18a2f371f5edf41810f6469cb9be39931ef9deb9 (diff) | |
Merge branch 'linus' into sched/core
Pick up the autogroups fix and other fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a123b13b70fd..7d8dfc7392f1 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -701,6 +701,13 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } | |||
| 701 | #define COMPACTION_BUILD 0 | 701 | #define COMPACTION_BUILD 0 |
| 702 | #endif | 702 | #endif |
| 703 | 703 | ||
| 704 | /* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */ | ||
| 705 | #ifdef CONFIG_SYMBOL_PREFIX | ||
| 706 | #define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX | ||
| 707 | #else | ||
| 708 | #define SYMBOL_PREFIX "" | ||
| 709 | #endif | ||
| 710 | |||
| 704 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ | 711 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ |
| 705 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | 712 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD |
| 706 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | 713 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |