diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-04 12:32:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-04 12:32:12 -0500 |
| commit | df2fc246c8ee8b6067af1fa55d3bc23107457f61 (patch) | |
| tree | 4f23eb533768183e55c91130ae58e5cbd5878e9b /kernel | |
| parent | 70dcc535bdf30ffaef58b867fbde45c0287f34c6 (diff) | |
| parent | 84ecfd15f5547c992c901df6ec14b4d507eb2c6e (diff) | |
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 4646eb2c382..767e559dfb1 100644 --- a/kernel/modsign_pubkey.c +++ b/kernel/modsign_pubkey.c | |||
| @@ -21,10 +21,10 @@ struct key *modsign_keyring; | |||
| 21 | extern __initdata const u8 modsign_certificate_list[]; | 21 | extern __initdata const u8 modsign_certificate_list[]; |
| 22 | extern __initdata const u8 modsign_certificate_list_end[]; | 22 | extern __initdata const u8 modsign_certificate_list_end[]; |
| 23 | asm(".section .init.data,\"aw\"\n" | 23 | asm(".section .init.data,\"aw\"\n" |
| 24 | "modsign_certificate_list:\n" | 24 | SYMBOL_PREFIX "modsign_certificate_list:\n" |
| 25 | ".incbin \"signing_key.x509\"\n" | 25 | ".incbin \"signing_key.x509\"\n" |
| 26 | ".incbin \"extra_certificates\"\n" | 26 | ".incbin \"extra_certificates\"\n" |
| 27 | "modsign_certificate_list_end:" | 27 | SYMBOL_PREFIX "modsign_certificate_list_end:" |
| 28 | ); | 28 | ); |
| 29 | 29 | ||
| 30 | /* | 30 | /* |