@@ -36,7 +36,7 @@
* This is intended to match the logic in irqentry_enter(), handling the kernel
* mode transitions only.
*/
-static __always_inline irqentry_state_t __enter_from_kernel_mode(struct pt_regs *regs)
+static noinstr irqentry_state_t enter_from_kernel_mode(struct pt_regs *regs)
{
irqentry_state_t ret = {
.exit_rcu = false,
@@ -55,13 +55,6 @@ static __always_inline irqentry_state_t __enter_from_kernel_mode(struct pt_regs
rcu_irq_enter_check_tick();
trace_hardirqs_off_finish();
- return ret;
-}
-
-static noinstr irqentry_state_t enter_from_kernel_mode(struct pt_regs *regs)
-{
- irqentry_state_t ret = __enter_from_kernel_mode(regs);
-
mte_check_tfsr_entry();
mte_disable_tco_entry(current);
The __enter_from_kernel_mode() is only called by enter_from_kernel_mode(), remove it. No functional changes. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- arch/arm64/kernel/entry-common.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)