History

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

Linus Torvalds committed 13 years ago

Commit df2fc242 parents 70dcc53 84ecfd12 files · +9 −2Browse files

Showing the changes to kernel (1 of 2 files). Show all

Unified · Split

kernel/modsign_pubkey.c+2−2
@@ -21,10 +21,10 @@ struct key *modsign_keyring; · 20 unmodified lines
21extern __initdata const u8 modsign_certificate_list[];21extern __initdata const u8 modsign_certificate_list[];
22extern __initdata const u8 modsign_certificate_list_end[];22extern __initdata const u8 modsign_certificate_list_end[];
23asm(".section .init.data,\"aw\"\n"23asm(".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/*