diff options
author | Chen Gang <gang.chen@asianux.com> | 2013-10-29 21:11:28 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2013-10-30 08:58:00 -0400 |
commit | 6ef4d2eaf5a46d4ab6db02612b5e883b834017b8 (patch) | |
tree | 9449c10dfb683cdcd507b37d29f9bb3173cba8c8 /kernel | |
parent | d2b86970245b64652c4d7799e707dd8bd1533b64 (diff) |
kernel/system_certificate.S: use real contents instead of macro GLOBAL()
If a macro is only used within 2 times, and also its contents are
within 2 lines, recommend to expand it to shrink code line.
For our case, the macro is not portable either: some architectures'
assembler may use another character to mark newline in a macro (e.g.
'`' for arc), which will cause issue.
If still want to use macro and let it portable enough, it will also
need include additional header file (e.g "#include <linux/linkage.h>",
although it also need be fixed).
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/system_certificates.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/system_certificates.S b/kernel/system_certificates.S index 552d47b2d463..4aef390671cb 100644 --- a/kernel/system_certificates.S +++ b/kernel/system_certificates.S | |||
@@ -1,12 +1,10 @@ | |||
1 | #include <linux/export.h> | 1 | #include <linux/export.h> |
2 | #include <linux/init.h> | 2 | #include <linux/init.h> |
3 | 3 | ||
4 | #define GLOBAL(name) \ | ||
5 | .globl VMLINUX_SYMBOL(name); \ | ||
6 | VMLINUX_SYMBOL(name): | ||
7 | |||
8 | __INITRODATA | 4 | __INITRODATA |
9 | 5 | ||
10 | GLOBAL(system_certificate_list) | 6 | .globl VMLINUX_SYMBOL(system_certificate_list) |
7 | VMLINUX_SYMBOL(system_certificate_list): | ||
11 | .incbin "kernel/x509_certificate_list" | 8 | .incbin "kernel/x509_certificate_list" |
12 | GLOBAL(system_certificate_list_end) | 9 | .globl VMLINUX_SYMBOL(system_certificate_list_end) |
10 | VMLINUX_SYMBOL(system_certificate_list_end): | ||