diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-04 12:32:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-04 12:32:12 -0500 |
| commit | df2fc246c8ee8b6067af1fa55d3bc23107457f61 (patch) | |
| tree | 4f23eb533768183e55c91130ae58e5cbd5878e9b /include/linux | |
| parent | 70dcc535bdf30ffaef58b867fbde45c0287f34c6 (diff) | |
| parent | 84ecfd15f5547c992c901df6ec14b4d507eb2c6e (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module fixes from Rusty Russell:
"Module signing build fixes for blackfin and metag"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
modsign: add symbol prefix to certificate list
linux/kernel.h: define SYMBOL_PREFIX
Diffstat (limited to 'include/linux')
| -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 |