From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com
Subject: [PATCHv2 09/10] arm64: frace: use asm EXPORT_SYMBOL()
Date: Fri, 7 Dec 2018 18:08:22 +0000 [thread overview]
Message-ID: <20181207180823.36612-10-mark.rutland@arm.com> (raw)
In-Reply-To: <20181207180823.36612-1-mark.rutland@arm.com>
For a while now it's been possible to use EXPORT_SYMBOL() in assembly
files, which allows us to place exports immediately after assembly
functions, as we do for C functions.
As a step towards removing arm64ksyms.c, let's move the ftrace exports
to the assembly files the functions are defined in.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/kernel/arm64ksyms.c | 5 -----
arch/arm64/kernel/entry-ftrace.S | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c
index c142103bc0fe..4ca8d2b245d2 100644
--- a/arch/arm64/kernel/arm64ksyms.c
+++ b/arch/arm64/kernel/arm64ksyms.c
@@ -28,8 +28,3 @@
#include <asm/checksum.h>
-#ifdef CONFIG_FUNCTION_TRACER
-EXPORT_SYMBOL(_mcount);
-NOKPROBE_SYMBOL(_mcount);
-#endif
-
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S
index 032e24d2d554..81b8eb5c4633 100644
--- a/arch/arm64/kernel/entry-ftrace.S
+++ b/arch/arm64/kernel/entry-ftrace.S
@@ -120,6 +120,8 @@ skip_ftrace_call: // }
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
mcount_exit
ENDPROC(_mcount)
+EXPORT_SYMBOL(_mcount)
+NOKPROBE(_mcount)
#else /* CONFIG_DYNAMIC_FTRACE */
/*
@@ -131,6 +133,8 @@ ENDPROC(_mcount)
ENTRY(_mcount)
ret
ENDPROC(_mcount)
+EXPORT_SYMBOL(_mcount)
+NOKPROBE(_mcount)
/*
* void ftrace_caller(unsigned long return_address)
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-12-07 18:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 18:08 [PATCHv2 00/10] arm64: assembly export cleanup Mark Rutland
2018-12-07 18:08 ` [PATCHv2 01/10] arm64: remove bitop exports Mark Rutland
2018-12-07 18:08 ` [PATCHv2 02/10] arm64: move memstart_addr export inline Mark Rutland
2018-12-07 18:08 ` [PATCHv2 03/10] arm64: add EXPORT_SYMBOL_NOKASAN() Mark Rutland
2018-12-07 18:08 ` [PATCHv2 04/10] arm64: tishift: use asm EXPORT_SYMBOL() Mark Rutland
2018-12-07 18:08 ` [PATCHv2 05/10] arm64: smccc: " Mark Rutland
2018-12-07 18:08 ` [PATCHv2 06/10] arm64: page: " Mark Rutland
2018-12-07 18:08 ` [PATCHv2 07/10] arm64: uaccess: " Mark Rutland
2018-12-07 18:08 ` [PATCHv2 08/10] arm64: string: " Mark Rutland
2018-12-07 18:08 ` Mark Rutland [this message]
2018-12-07 18:08 ` [PATCHv2 10/10] arm64: remove arm64ksyms.c Mark Rutland
2018-12-10 11:50 ` [PATCHv2 00/10] arm64: assembly export cleanup Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181207180823.36612-10-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox