summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-10-30 09:11:28 +0800
committerDavid Howells <dhowells@redhat.com>2013-10-30 12:58:00 +0000
commit6ef4d2eaf5a46d4ab6db02612b5e883b834017b8 (patch)
tree9449c10dfb683cdcd507b37d29f9bb3173cba8c8
parentd2b86970245b64652c4d7799e707dd8bd1533b64 (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>
-rw-r--r--kernel/system_certificates.S10
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 @@
#include <linux/export.h>
#include <linux/init.h>
-#define GLOBAL(name) \
- .globl VMLINUX_SYMBOL(name); \
- VMLINUX_SYMBOL(name):
-
__INITRODATA
-GLOBAL(system_certificate_list)
+ .globl VMLINUX_SYMBOL(system_certificate_list)
+VMLINUX_SYMBOL(system_certificate_list):
.incbin "kernel/x509_certificate_list"
-GLOBAL(system_certificate_list_end)
+ .globl VMLINUX_SYMBOL(system_certificate_list_end)
+VMLINUX_SYMBOL(system_certificate_list_end):