Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-block.git] / certs / system_certificates.S

diff --git a/certs/system_certificates.S b/certs/system_certificates.S
index 9216e8c817649eefd3a6d9c2a64a1b4da2b38ffe..c9ceb71a43fef10925090939e9ce3de8367e8e86 100644 (file)
--- a/certs/system_certificates.S
+++ b/certs/system_certificates.S
@@ -13,6 +13,19 @@ __cert_list_start:
        .incbin "certs/x509_certificate_list"
 __cert_list_end:
 
+#ifdef CONFIG_SYSTEM_EXTRA_CERTIFICATE
+       .globl VMLINUX_SYMBOL(system_extra_cert)
+       .size system_extra_cert, CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE
+VMLINUX_SYMBOL(system_extra_cert):
+       .fill CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE, 1, 0
+
+       .align 4
+       .globl VMLINUX_SYMBOL(system_extra_cert_used)
+VMLINUX_SYMBOL(system_extra_cert_used):
+       .int 0
+
+#endif /* CONFIG_SYSTEM_EXTRA_CERTIFICATE */
+
        .align 8
        .globl VMLINUX_SYMBOL(system_certificate_list_size)
 VMLINUX_SYMBOL(system_certificate_list_size):