diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /kernel/system_certificates.S | |
parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'kernel/system_certificates.S')
-rw-r--r-- | kernel/system_certificates.S | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel/system_certificates.S b/kernel/system_certificates.S index 4aef390671c..3e9868d4753 100644 --- a/kernel/system_certificates.S +++ b/kernel/system_certificates.S @@ -3,8 +3,18 @@ __INITRODATA + .align 8 .globl VMLINUX_SYMBOL(system_certificate_list) VMLINUX_SYMBOL(system_certificate_list): +__cert_list_start: .incbin "kernel/x509_certificate_list" - .globl VMLINUX_SYMBOL(system_certificate_list_end) -VMLINUX_SYMBOL(system_certificate_list_end): +__cert_list_end: + + .align 8 + .globl VMLINUX_SYMBOL(system_certificate_list_size) +VMLINUX_SYMBOL(system_certificate_list_size): +#ifdef CONFIG_64BIT + .quad __cert_list_end - __cert_list_start +#else + .long __cert_list_end - __cert_list_start +#endif |