projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-rdma-4.5-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma
[cascardo/linux.git]
/
include
/
linux
/
ftrace.h
diff --git
a/include/linux/ftrace.h
b/include/linux/ftrace.h
index
0639dcc
..
81de712
100644
(file)
--- a/
include/linux/ftrace.h
+++ b/
include/linux/ftrace.h
@@
-165,7
+165,6
@@
struct ftrace_ops {
ftrace_func_t saved_func;
int __percpu *disabled;
#ifdef CONFIG_DYNAMIC_FTRACE
- int nr_trampolines;
struct ftrace_ops_hash local_hash;
struct ftrace_ops_hash *func_hash;
struct ftrace_ops_hash old_hash;