Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4df32c8 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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



With the special case handling for Blackfin and Metag was removed by
commit 94e58e0a ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 6fbd8569

certs/system_certificates.S

+8 −8
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
	__INITRODATA



	.align 8

	.globl VMLINUX_SYMBOL(system_certificate_list)

VMLINUX_SYMBOL(system_certificate_list):

	.globl system_certificate_list

system_certificate_list:

__cert_list_start:

#ifdef CONFIG_MODULE_SIG

	.incbin "certs/signing_key.x509"
@@ -15,21 +15,21 @@ __cert_list_start: 
__cert_list_end:



#ifdef CONFIG_SYSTEM_EXTRA_CERTIFICATE

	.globl VMLINUX_SYMBOL(system_extra_cert)

	.globl system_extra_cert

	.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



	.align 4

	.globl VMLINUX_SYMBOL(system_extra_cert_used)

VMLINUX_SYMBOL(system_extra_cert_used):

	.globl system_extra_cert_used

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):

	.globl system_certificate_list_size

system_certificate_list_size:

#ifdef CONFIG_64BIT

	.quad __cert_list_end - __cert_list_start

#else

include/linux/export.h

+0 −7
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ 
 * 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__

struct kernel_symbol

{

usr/initramfs_data.S

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ __irf_start: 
.incbin __stringify(INITRAMFS_IMAGE)

__irf_end:

.section .init.ramfs.info,"a"

.globl VMLINUX_SYMBOL(__initramfs_size)

VMLINUX_SYMBOL(__initramfs_size):

.globl __initramfs_size

__initramfs_size:

#ifdef CONFIG_64BIT

	.quad __irf_end - __irf_start

#else