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

+9 -2
+7
include/linux/kernel.h
··· 701 701 #define COMPACTION_BUILD 0 702 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 711 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ 705 712 #ifdef CONFIG_FTRACE_MCOUNT_RECORD 706 713 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
+2 -2
kernel/modsign_pubkey.c
··· 21 21 extern __initdata const u8 modsign_certificate_list[]; 22 22 extern __initdata const u8 modsign_certificate_list_end[]; 23 23 asm(".section .init.data,\"aw\"\n" 24 - "modsign_certificate_list:\n" 24 + SYMBOL_PREFIX "modsign_certificate_list:\n" 25 25 ".incbin \"signing_key.x509\"\n" 26 26 ".incbin \"extra_certificates\"\n" 27 - "modsign_certificate_list_end:" 27 + SYMBOL_PREFIX "modsign_certificate_list_end:" 28 28 ); 29 29 30 30 /*