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

Commit 827456e7 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: Export _mcount alongside its definition 



Now that EXPORT_SYMBOL can be used from assembly source, move the
EXPORT_SYMBOL invocation for _mcount to be alongside its definition.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14525/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 29830c12

arch/mips/kernel/mcount.S

+3 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * Author: Wu Zhangjin <wuzhangjin@gmail.com>

 * Author: Wu Zhangjin <wuzhangjin@gmail.com>

 */

 */





#include <asm/export.h>

#include <asm/regdef.h>

#include <asm/regdef.h>

#include <asm/stackframe.h>

#include <asm/stackframe.h>

#include <asm/ftrace.h>

#include <asm/ftrace.h>
@@ -66,6 +67,7 @@ 
NESTED(ftrace_caller, PT_SIZE, ra)

NESTED(ftrace_caller, PT_SIZE, ra)

	.globl _mcount

	.globl _mcount

_mcount:

_mcount:

EXPORT_SYMBOL(_mcount)

	b	ftrace_stub

	b	ftrace_stub

#ifdef CONFIG_32BIT

#ifdef CONFIG_32BIT

	 addiu sp,sp,8

	 addiu sp,sp,8
@@ -114,6 +116,7 @@ ftrace_stub: 
#else	/* ! CONFIG_DYNAMIC_FTRACE */

#else	/* ! CONFIG_DYNAMIC_FTRACE */





NESTED(_mcount, PT_SIZE, ra)

NESTED(_mcount, PT_SIZE, ra)

EXPORT_SYMBOL(_mcount)

	PTR_LA	t1, ftrace_stub

	PTR_LA	t1, ftrace_stub

	PTR_L	t2, ftrace_trace_function /* Prepare t2 for (1) */

	PTR_L	t2, ftrace_trace_function /* Prepare t2 for (1) */

	bne	t1, t2, static_trace

	bne	t1, t2, static_trace

arch/mips/kernel/mips_ksyms.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -80,7 +80,3 @@ EXPORT_SYMBOL(__csum_partial_copy_from_user); 
#endif

#endif





EXPORT_SYMBOL(invalid_pte_table);
 
EXPORT_SYMBOL(invalid_pte_table);
 
#ifdef CONFIG_FUNCTION_TRACER

/* _mcount is defined in arch/mips/kernel/mcount.S */

EXPORT_SYMBOL(_mcount);

#endif