mirrors
/
anolis-cloud-kernel
mirror of https://gitee.com/anolis/cloud-kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

anolis: ftrace: remove KABI workaround about struct ftrace_regs 

ANBZ: #9084

KABI no longer needs to be kept between anolis major versions. Remove
it.

Signed-off-by: Tianchen Ding <dtcccc@linux.alibaba.com>
Reviewed-by: Yuanhe Shu <xiangzao@linux.alibaba.com>
Link: https://gitee.com/anolis/cloud-kernel/pulls/3230
This commit is contained in:
Tianchen Ding 2024-05-20 15:48:27 +08:00 committed by 小龙
parent 30d4d7cddf
commit 1b4bd4f1ff
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm64/include/asm/ftrace.h
View File

@ -64,23 +64,20 @@ struct ftrace_ops;
* stack alignment
*/
struct ftrace_regs {
CK_KABI_REPLACE_SPLIT(
struct pt_regs regs,
/* x0 - x8 */
unsigned long regs[9],
unsigned long regs[9];
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
unsigned long direct_tramp,
unsigned long direct_tramp;
#else
unsigned long __unused,
unsigned long __unused;
#endif
unsigned long fp,
unsigned long lr,
unsigned long fp;
unsigned long lr;
unsigned long sp,
unsigned long pc,
)
unsigned long sp;
unsigned long pc;
};
static __always_inline unsigned long

9
include/linux/ftrace.h
View File

@ -157,11 +157,7 @@ static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs)
#endif
typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
#ifndef __GENKSYMS__
struct ftrace_ops *op, struct ftrace_regs *fregs);
#else
struct ftrace_ops *op, struct pt_regs *regs);
#endif
ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops);
@ -325,9 +321,12 @@ struct ftrace_ops {
unsigned long trampoline_size;
struct list_head list;
ftrace_ops_func_t ops_func;
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
unsigned long direct_call;
#endif
#endif
CK_KABI_USE(1, unsigned long direct_call)
CK_KABI_RESERVE(1)
};
extern struct ftrace_ops __rcu *ftrace_ops_list;