| Message ID | 20220929094134.99512-2-lihuafei1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: module/ftrace: Fix mcount-based ftrace initialization failure | expand |
On Thu, Sep 29, 2022 at 05:41:32PM +0800, Li Huafei wrote: > Since commit 4e69ecf4da1e ("arm64/module: ftrace: deal with place > relative nature of PLTs"), plt_equals_entry() is not used outside of > module-plts.c, so make it static. > > Signed-off-by: Li Huafei <lihuafei1@huawei.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/include/asm/module.h | 1 - > arch/arm64/kernel/module-plts.c | 3 ++- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h > index 4e7fa2623896..28514b989a0b 100644 > --- a/arch/arm64/include/asm/module.h > +++ b/arch/arm64/include/asm/module.h > @@ -58,7 +58,6 @@ static inline bool is_forbidden_offset_for_adrp(void *place) > } > > struct plt_entry get_plt_entry(u64 dst, void *pc); > -bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b); > > static inline bool plt_entry_is_initialized(const struct plt_entry *e) > { > diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c > index a3d0494f25a9..5a0a8f552a61 100644 > --- a/arch/arm64/kernel/module-plts.c > +++ b/arch/arm64/kernel/module-plts.c > @@ -37,7 +37,8 @@ struct plt_entry get_plt_entry(u64 dst, void *pc) > return plt; > } > > -bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b) > +static bool plt_entries_equal(const struct plt_entry *a, > + const struct plt_entry *b) > { > u64 p, q; > > -- > 2.17.1 >
diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h index 4e7fa2623896..28514b989a0b 100644 --- a/arch/arm64/include/asm/module.h +++ b/arch/arm64/include/asm/module.h @@ -58,7 +58,6 @@ static inline bool is_forbidden_offset_for_adrp(void *place) } struct plt_entry get_plt_entry(u64 dst, void *pc); -bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b); static inline bool plt_entry_is_initialized(const struct plt_entry *e) { diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c index a3d0494f25a9..5a0a8f552a61 100644 --- a/arch/arm64/kernel/module-plts.c +++ b/arch/arm64/kernel/module-plts.c @@ -37,7 +37,8 @@ struct plt_entry get_plt_entry(u64 dst, void *pc) return plt; } -bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b) +static bool plt_entries_equal(const struct plt_entry *a, + const struct plt_entry *b) { u64 p, q;
Since commit 4e69ecf4da1e ("arm64/module: ftrace: deal with place relative nature of PLTs"), plt_equals_entry() is not used outside of module-plts.c, so make it static. Signed-off-by: Li Huafei <lihuafei1@huawei.com> --- arch/arm64/include/asm/module.h | 1 - arch/arm64/kernel/module-plts.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)