diff options
| author | Linus Torvalds | 2012-12-04 18:32:12 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-04 18:32:12 +0100 |
| commit | df2fc246c8ee8b6067af1fa55d3bc23107457f61 (patch) | |
| tree | 4f23eb533768183e55c91130ae58e5cbd5878e9b /kernel | |
| parent | Merge tag 'upstream-3.7-rc9' of git://git.infradead.org/linux-ubi (diff) | |
| parent | modsign: add symbol prefix to certificate list (diff) | |
| download | kernel-qcow2-linux-df2fc246c8ee8b6067af1fa55d3bc23107457f61.tar.gz kernel-qcow2-linux-df2fc246c8ee8b6067af1fa55d3bc23107457f61.tar.xz kernel-qcow2-linux-df2fc246c8ee8b6067af1fa55d3bc23107457f61.zip | |
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 'kernel')
| -rw-r--r-- | kernel/modsign_pubkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c index 4646eb2c3820..767e559dfb10 100644 --- a/kernel/modsign_pubkey.c +++ b/kernel/modsign_pubkey.c @@ -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:" ); /* |