Skip to content

Commit 8788ca1

Browse files
FlorentRevestrostedt
authored andcommitted
ftrace: Remove the legacy _ftrace_direct API
This API relies on a single global ops, used for all direct calls registered with it. However, to implement arm64 direct calls, we need each ops to point to a single direct call trampoline. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Florent Revest <[email protected]> Acked-by: Mark Rutland <[email protected]> Tested-by: Mark Rutland <[email protected]> Acked-by: Jiri Olsa <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 23edf48 commit 8788ca1

File tree

2 files changed

+0
-425
lines changed

2 files changed

+0
-425
lines changed

include/linux/ftrace.h

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,6 @@ struct ftrace_func_entry {
397397

398398
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
399399
extern int ftrace_direct_func_count;
400-
int register_ftrace_direct(unsigned long ip, unsigned long addr);
401-
int unregister_ftrace_direct(unsigned long ip, unsigned long addr);
402-
int modify_ftrace_direct(unsigned long ip, unsigned long old_addr, unsigned long new_addr);
403-
struct ftrace_direct_func *ftrace_find_direct_func(unsigned long addr);
404-
int ftrace_modify_direct_caller(struct ftrace_func_entry *entry,
405-
struct dyn_ftrace *rec,
406-
unsigned long old_addr,
407-
unsigned long new_addr);
408400
unsigned long ftrace_find_rec_direct(unsigned long ip);
409401
int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);
410402
int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
@@ -415,30 +407,6 @@ int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr
415407
#else
416408
struct ftrace_ops;
417409
# define ftrace_direct_func_count 0
418-
static inline int register_ftrace_direct(unsigned long ip, unsigned long addr)
419-
{
420-
return -ENOTSUPP;
421-
}
422-
static inline int unregister_ftrace_direct(unsigned long ip, unsigned long addr)
423-
{
424-
return -ENOTSUPP;
425-
}
426-
static inline int modify_ftrace_direct(unsigned long ip,
427-
unsigned long old_addr, unsigned long new_addr)
428-
{
429-
return -ENOTSUPP;
430-
}
431-
static inline struct ftrace_direct_func *ftrace_find_direct_func(unsigned long addr)
432-
{
433-
return NULL;
434-
}
435-
static inline int ftrace_modify_direct_caller(struct ftrace_func_entry *entry,
436-
struct dyn_ftrace *rec,
437-
unsigned long old_addr,
438-
unsigned long new_addr)
439-
{
440-
return -ENODEV;
441-
}
442410
static inline unsigned long ftrace_find_rec_direct(unsigned long ip)
443411
{
444412
return 0;

0 commit comments

Comments
 (0)