Commit dbd31962 authored Dec 07, 2018 by Mark Rutland Committed by Will Deacon Dec 10, 2018

arm64: frace: use asm EXPORT_SYMBOL()



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>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent ac0e8c72

arch/arm64/kernel/arm64ksyms.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -28,8 +28,3 @@

		#include <asm/checksum.h>

		#ifdef CONFIG_FUNCTION_TRACER
		EXPORT_SYMBOL(_mcount);
		NOKPROBE_SYMBOL(_mcount);
		#endif

arch/arm64/kernel/entry-ftrace.S

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)