History

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

Linus Torvalds committed 13 years ago

Commit df2fc242 parents 70dcc53 84ecfd12 files · +9 −2Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/kernel.h+7−0
@@ -701,6 +701,13 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } · 700 unmodified lines
701701 #define COMPACTION_BUILD 0
702702 #endif
703703
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+
704711 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
705712 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
706713 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD