Commit 3a2bfec0 authored by Li kunyu's avatar Li kunyu Committed by Steven Rostedt (Google)
Browse files

ftrace: Remove return value of ftrace_arch_modify_*() 

All instances of the function ftrace_arch_modify_prepare() and
  ftrace_arch_modify_post_process() return zero. There's no point in
  checking their return value. Just have them be void functions.

Link: https://lkml.kernel.org/r/20220518023639.4065-1-kunyu@nfschina.com



Signed-off-by: default avatarLi kunyu <kunyu@nfschina.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2decd16f

arch/arm/kernel/ftrace.c

+2 −4
Original line number Diff line number Diff line
@@ -79,16 +79,14 @@ static unsigned long __ref adjust_address(struct dyn_ftrace *rec, 
	return (unsigned long)&ftrace_regs_caller_from_init;

}



int ftrace_arch_code_modify_prepare(void)

void ftrace_arch_code_modify_prepare(void)

{

	return 0;

}



int ftrace_arch_code_modify_post_process(void)

void ftrace_arch_code_modify_post_process(void)

{

	/* Make sure any TLB misses during machine stop are cleared. */

	flush_tlb_all();

	return 0;

}



static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,

arch/riscv/kernel/ftrace.c

+2 −4
Original line number Diff line number Diff line
@@ -12,16 +12,14 @@ 
#include <asm/patch.h>



#ifdef CONFIG_DYNAMIC_FTRACE

int ftrace_arch_code_modify_prepare(void) __acquires(&text_mutex)

void ftrace_arch_code_modify_prepare(void) __acquires(&text_mutex)

{

	mutex_lock(&text_mutex);

	return 0;

}



int ftrace_arch_code_modify_post_process(void) __releases(&text_mutex)

void ftrace_arch_code_modify_post_process(void) __releases(&text_mutex)

{

	mutex_unlock(&text_mutex);

	return 0;

}



static int ftrace_check_current_call(unsigned long hook_pos,

arch/s390/kernel/ftrace.c

+1 −2
Original line number Diff line number Diff line
@@ -225,14 +225,13 @@ void arch_ftrace_update_code(int command) 
	ftrace_modify_all_code(command);

}



int ftrace_arch_code_modify_post_process(void)

void ftrace_arch_code_modify_post_process(void)

{

	/*

	 * Flush any pre-fetched instructions on all

	 * CPUs to make the new code visible.

	 */

	text_poke_sync_lock();

	return 0;

}



#ifdef CONFIG_MODULES

arch/x86/kernel/ftrace.c

+2 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


static int ftrace_poke_late = 0;



int ftrace_arch_code_modify_prepare(void)

void ftrace_arch_code_modify_prepare(void)

    __acquires(&text_mutex)

{

	/*
@@ -47,10 +47,9 @@ int ftrace_arch_code_modify_prepare(void) 
	 */

	mutex_lock(&text_mutex);

	ftrace_poke_late = 1;

	return 0;

}



int ftrace_arch_code_modify_post_process(void)

void ftrace_arch_code_modify_post_process(void)

    __releases(&text_mutex)

{

	/*
@@ -61,7 +60,6 @@ int ftrace_arch_code_modify_post_process(void) 
	text_poke_finish();

	ftrace_poke_late = 0;

	mutex_unlock(&text_mutex);

	return 0;

}



static const char *ftrace_nop_replace(void)

include/linux/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ static inline void stack_tracer_enable(void) { } 


#ifdef CONFIG_DYNAMIC_FTRACE



int ftrace_arch_code_modify_prepare(void);

int ftrace_arch_code_modify_post_process(void);

void ftrace_arch_code_modify_prepare(void);

void ftrace_arch_code_modify_post_process(void);



enum ftrace_bug_type {

	FTRACE_BUG_UNKNOWN,