mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
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>
This commit is contained in:
parent
0eb967012e
commit
1d74f2a0f6
@ -22,16 +22,6 @@
|
|||||||
static unsigned long bl_insn;
|
static unsigned long bl_insn;
|
||||||
static const unsigned long NOP = 0xe1a00000; /* mov r0, r0 */
|
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)
|
unsigned char *ftrace_nop_replace(void)
|
||||||
{
|
{
|
||||||
return (char *)&NOP;
|
return (char *)&NOP;
|
||||||
|
@ -27,16 +27,6 @@ static unsigned int ftrace_nop = 0x60000000;
|
|||||||
# define GET_ADDR(addr) *(unsigned long *)addr
|
# define GET_ADDR(addr) *(unsigned long *)addr
|
||||||
#endif
|
#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)
|
static unsigned int notrace ftrace_calc_offset(long ip, long addr)
|
||||||
{
|
{
|
||||||
return (int)((addr + CALL_BACK) - ip);
|
return (int)((addr + CALL_BACK) - ip);
|
||||||
|
@ -7,13 +7,6 @@
|
|||||||
|
|
||||||
static const u32 ftrace_nop = 0x01000000;
|
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)
|
notrace unsigned char *ftrace_nop_replace(void)
|
||||||
{
|
{
|
||||||
return (char *)&ftrace_nop;
|
return (char *)&ftrace_nop;
|
||||||
|
@ -31,16 +31,6 @@ union ftrace_code_union {
|
|||||||
} __attribute__((packed));
|
} __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)
|
static int notrace ftrace_calc_offset(long ip, long addr)
|
||||||
{
|
{
|
||||||
return (int)(addr - ip);
|
return (int)(addr - ip);
|
||||||
|
@ -306,13 +306,6 @@ ftrace_record_ip(unsigned long ip)
|
|||||||
if (ftrace_ip_in_hash(ip, key))
|
if (ftrace_ip_in_hash(ip, key))
|
||||||
goto out_unlock;
|
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);
|
node = ftrace_alloc_dyn_node(ip);
|
||||||
if (!node)
|
if (!node)
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
Loading…
Reference in New Issue
Block a user