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

Commit 37135677 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

ftrace: fix mcount export bug 



David S. Miller noticed the following bug: the -pg instrumentation
function callback is named differently on each platform. On x86 it
is mcount, on sparc it is _mcount. So the export does not make sense
in kernel/trace/ftrace.c - move it to x86.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d05f5f99

arch/x86/kernel/i386_ksyms_32.c

+8 −1
Original line number Diff line number Diff line 
#include <linux/ftrace.h>

#include <linux/module.h>



#include <asm/checksum.h>

#include <asm/desc.h>

#include <asm/pgtable.h>

#include <asm/desc.h>



#ifdef CONFIG_FTRACE

/* mcount is defined in assembly */

EXPORT_SYMBOL(mcount);

#endif



/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial_copy_generic);

arch/x86/kernel/x8664_ksyms_64.c

+9 −2
Original line number Diff line number Diff line 
/* Exports for assembly files.

   All C exports should go in the respective C files. */



#include <linux/ftrace.h>

#include <linux/module.h>

#include <net/checksum.h>

#include <linux/smp.h>



#include <net/checksum.h>



#include <asm/processor.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/uaccess.h>

#include <asm/desc.h>



#ifdef CONFIG_FTRACE

/* mcount is defined in assembly */

EXPORT_SYMBOL(mcount);

#endif



EXPORT_SYMBOL(kernel_thread);



EXPORT_SYMBOL(__get_user_1);

kernel/trace/ftrace.c

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static struct ftrace_ops ftrace_list_end __read_mostly = 
static struct ftrace_ops *ftrace_list __read_mostly = &ftrace_list_end;

ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub;



/* mcount is defined per arch in assembly */

EXPORT_SYMBOL(mcount);



void ftrace_list_func(unsigned long ip, unsigned long parent_ip)

{

	struct ftrace_ops *op = ftrace_list;