diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-08-14 12:08:39 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-08-14 12:08:39 +1000 |
| commit | e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e (patch) | |
| tree | 8ad26407ec8b8898f6ff5f396ff628919a56c624 /kernel/system_certificates.S | |
| parent | aa62efff65ba572814511efa68cb158fe9e960c4 (diff) | |
| parent | e9a5e8cc55286941503f36c5b7485a5aa923b3f1 (diff) | |
Merge tag 'modsign-pkcs7-20150812-3' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'kernel/system_certificates.S')
| -rw-r--r-- | kernel/system_certificates.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/system_certificates.S b/kernel/system_certificates.S index 3e9868d47535..6ba2f75e7ba5 100644 --- a/kernel/system_certificates.S +++ b/kernel/system_certificates.S @@ -7,6 +7,9 @@ .globl VMLINUX_SYMBOL(system_certificate_list) VMLINUX_SYMBOL(system_certificate_list): __cert_list_start: +#ifdef CONFIG_MODULE_SIG + .incbin "signing_key.x509" +#endif .incbin "kernel/x509_certificate_list" __cert_list_end: |