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

Commit 1d74f2a0 authored Jun 01, 2008 by Abhishek Sagar Committed by Ingo Molnar Jun 10, 2008

ftrace: remove ftrace_ip_converted()



Remove the unneeded function ftrace_ip_converted().

Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 0eb96701

arch/arm/kernel/ftrace.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -22,16 +22,6 @@
		static unsigned long bl_insn;
		static const unsigned long NOP = 0xe1a00000; /* mov r0, r0 */

		/* return true if mcount call site is already patched/no-op'ed */
		int ftrace_ip_converted(unsigned long pc)
		{
		unsigned long save;

		pc -= INSN_SIZE;
		save = (unsigned long )pc;
		return save == NOP;
		}

		unsigned char *ftrace_nop_replace(void)
		{
		return (char *)&NOP;

arch/powerpc/kernel/ftrace.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -27,16 +27,6 @@ static unsigned int ftrace_nop = 0x60000000;
		# define GET_ADDR(addr) (unsigned long )addr
		#endif

		notrace int ftrace_ip_converted(unsigned long ip)
		{
		unsigned int save;

		ip -= CALL_BACK;
		save = (unsigned int )ip;

		return save == ftrace_nop;
		}

		static unsigned int notrace ftrace_calc_offset(long ip, long addr)
		{
		return (int)((addr + CALL_BACK) - ip);

arch/sparc64/kernel/ftrace.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -7,13 +7,6 @@

		static const u32 ftrace_nop = 0x01000000;

		notrace int ftrace_ip_converted(unsigned long ip)
		{
		u32 insn = (u32 ) ip;

		return (insn == ftrace_nop);
		}

		notrace unsigned char *ftrace_nop_replace(void)
		{
		return (char *)&ftrace_nop;

arch/x86/kernel/ftrace.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -31,16 +31,6 @@ union ftrace_code_union {
		} __attribute__((packed));
		};

		notrace int ftrace_ip_converted(unsigned long ip)
		{
		unsigned long save;

		ip -= CALL_BACK;
		save = (long )ip;

		return save == *ftrace_nop;
		}

		static int notrace ftrace_calc_offset(long ip, long addr)
		{
		return (int)(addr - ip);

kernel/trace/ftrace.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -306,13 +306,6 @@ ftrace_record_ip(unsigned long ip)
		if (ftrace_ip_in_hash(ip, key))
		goto out_unlock;

		/*
		* There's a slight race that the ftraced will update the
		* hash and reset here. If it is already converted, skip it.
		*/
		if (ftrace_ip_converted(ip))
		goto out_unlock;

		node = ftrace_alloc_dyn_node(ip);
		if (!node)
		goto out_unlock;