Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit df2fc246c8ee8b6067af1fa55d3bc23107457f61

Authored by Linus Torvalds
2 parents 70dcc535bd 84ecfd15f5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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

Showing 2 changed files Side-by-side Diff

include/linux/kernel.h
Diff comments   View file @ df2fc24
... ... @@ -701,6 +701,13 @@
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
kernel/modsign_pubkey.c
Diff comments   View file @ df2fc24
... ... @@ -21,10 +21,10 @@
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 /*