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

Commit 5eb8ae50 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/ftrace: avoid pointer arithmetics with function pointers 



Pointer arithmetics with function pointers is not really defined, but
seems to do the right thing. Let's cast to a void pointer to have a
defined behaviour, at least when using gcc.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 63df41d6

arch/s390/kernel/ftrace.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ int ftrace_enable_ftrace_graph_caller(void) 




	offset = ((void *) prepare_ftrace_return -

	offset = ((void *) prepare_ftrace_return -

		  (void *) ftrace_graph_caller) / 2;

		  (void *) ftrace_graph_caller) / 2;

	return probe_kernel_write(ftrace_graph_caller + 2,

	return probe_kernel_write((void *) ftrace_graph_caller + 2,

				  &offset, sizeof(offset));

				  &offset, sizeof(offset));

}

}
@@ -186,7 +186,7 @@ int ftrace_disable_ftrace_graph_caller(void) 
{

{

	static unsigned short offset = 0x0002;

	static unsigned short offset = 0x0002;





	return probe_kernel_write(ftrace_graph_caller + 2,

	return probe_kernel_write((void *) ftrace_graph_caller + 2,

				  &offset, sizeof(offset));

				  &offset, sizeof(offset));

}

}