Commit df2fc246 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 70dcc535 84ecfd15

include/linux/kernel.h

+7 −0
Original line number Diff line number Diff line
@@ -701,6 +701,13 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } 
#define COMPACTION_BUILD 0

#endif



/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */

#ifdef CONFIG_SYMBOL_PREFIX

#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX

#else

#define SYMBOL_PREFIX ""

#endif



/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */

#ifdef CONFIG_FTRACE_MCOUNT_RECORD

# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD

kernel/modsign_pubkey.c

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ struct key *modsign_keyring; 
extern __initdata const u8 modsign_certificate_list[];

extern __initdata const u8 modsign_certificate_list_end[];

asm(".section .init.data,\"aw\"\n"

    "modsign_certificate_list:\n"

    SYMBOL_PREFIX "modsign_certificate_list:\n"

    ".incbin \"signing_key.x509\"\n"

    ".incbin \"extra_certificates\"\n"

    "modsign_certificate_list_end:"

    SYMBOL_PREFIX "modsign_certificate_list_end:"

    );



/*