Skip to content

Commit

Permalink
export.h: remove VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR()
Browse files Browse the repository at this point in the history
With the special case handling for Blackfin and Metag was removed by
commit 94e58e0 ("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 <[email protected]>
  • Loading branch information
masahir0y committed Aug 22, 2018
1 parent 6fbd856 commit c4df32c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
16 changes: 8 additions & 8 deletions certs/system_certificates.S
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions include/linux/export.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions usr/initramfs_data.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c4df32c

Please sign in to comment.