export.h: remove VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR()

With the special case handling for Blackfin and Metag was removed by
commit 94e58e0ac3 ("export.h: remove code for prefixing symbols with
underscore"), VMLINUX_SYMBOL() is no-op.

Replace the remaining usages, then remove the definition of
VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-08-19 07:34:47 +09:00
parent 6fbd856950
commit c4df32c80d
3 changed files with 10 additions and 17 deletions

View File

@ -5,8 +5,8 @@
__INITRODATA __INITRODATA
.align 8 .align 8
.globl VMLINUX_SYMBOL(system_certificate_list) .globl system_certificate_list
VMLINUX_SYMBOL(system_certificate_list): system_certificate_list:
__cert_list_start: __cert_list_start:
#ifdef CONFIG_MODULE_SIG #ifdef CONFIG_MODULE_SIG
.incbin "certs/signing_key.x509" .incbin "certs/signing_key.x509"
@ -15,21 +15,21 @@ __cert_list_start:
__cert_list_end: __cert_list_end:
#ifdef CONFIG_SYSTEM_EXTRA_CERTIFICATE #ifdef CONFIG_SYSTEM_EXTRA_CERTIFICATE
.globl VMLINUX_SYMBOL(system_extra_cert) .globl system_extra_cert
.size system_extra_cert, CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE .size system_extra_cert, CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE
VMLINUX_SYMBOL(system_extra_cert): system_extra_cert:
.fill CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE, 1, 0 .fill CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE, 1, 0
.align 4 .align 4
.globl VMLINUX_SYMBOL(system_extra_cert_used) .globl system_extra_cert_used
VMLINUX_SYMBOL(system_extra_cert_used): system_extra_cert_used:
.int 0 .int 0
#endif /* CONFIG_SYSTEM_EXTRA_CERTIFICATE */ #endif /* CONFIG_SYSTEM_EXTRA_CERTIFICATE */
.align 8 .align 8
.globl VMLINUX_SYMBOL(system_certificate_list_size) .globl system_certificate_list_size
VMLINUX_SYMBOL(system_certificate_list_size): system_certificate_list_size:
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
.quad __cert_list_end - __cert_list_start .quad __cert_list_end - __cert_list_start
#else #else

View File

@ -10,13 +10,6 @@
* hackers place grumpy comments in header files. * hackers place grumpy comments in header files.
*/ */
#define __VMLINUX_SYMBOL(x) x
#define __VMLINUX_SYMBOL_STR(x) #x
/* Indirect, so macros are expanded before pasting. */
#define VMLINUX_SYMBOL(x) __VMLINUX_SYMBOL(x)
#define VMLINUX_SYMBOL_STR(x) __VMLINUX_SYMBOL_STR(x)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct kernel_symbol struct kernel_symbol
{ {

View File

@ -30,8 +30,8 @@ __irf_start:
.incbin __stringify(INITRAMFS_IMAGE) .incbin __stringify(INITRAMFS_IMAGE)
__irf_end: __irf_end:
.section .init.ramfs.info,"a" .section .init.ramfs.info,"a"
.globl VMLINUX_SYMBOL(__initramfs_size) .globl __initramfs_size
VMLINUX_SYMBOL(__initramfs_size): __initramfs_size:
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
.quad __irf_end - __irf_start .quad __irf_end - __irf_start
#else #else