git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
ftrace.c
diff --git
a/arch/x86/kernel/ftrace.c
b/arch/x86/kernel/ftrace.c
index 8257a59704ae9f5dd0726c8680c44abaeb44ec3b..3e3789c8f8e1a7c91df904d2e990fc6f5de3ca01 100644
(file)
--- a/
arch/x86/kernel/ftrace.c
+++ b/
arch/x86/kernel/ftrace.c
@@
-269,7
+269,7
@@
int ftrace_update_ftrace_func(ftrace_func_t func)
return ret;
}
return ret;
}
-static int is_ftrace_caller(unsigned long ip)
+static
nokprobe_inline
int is_ftrace_caller(unsigned long ip)
{
if (ip == ftrace_update_func)
return 1;
{
if (ip == ftrace_update_func)
return 1;
@@
-299,6
+299,7
@@
int ftrace_int3_handler(struct pt_regs *regs)
return 1;
}
return 1;
}
+NOKPROBE_SYMBOL(ftrace_int3_handler);
static int ftrace_write(unsigned long ip, const char *val, int size)
{
static int ftrace_write(unsigned long ip, const char *val, int size)
{