2022-06-19 23:21:23

by Max Filippov

Subject: [PATCH 1/2] xtensa: rename context_tracking_user_{enter,exit}

This fixes the following build error in the linux-next:

arch/xtensa/kernel/entry.o:(.text+0x4): undefined reference to `context_tracking_user_exit'
arch/xtensa/kernel/entry.o: In function `common_exception':
(.text+0x1ac): undefined reference to `context_tracking_user_exit'
arch/xtensa/kernel/entry.o:(.text+0x14): undefined reference to `context_tracking_user_enter'
arch/xtensa/kernel/entry.o: In function `common_exception_return':
(.text+0x20d): undefined reference to `context_tracking_user_enter'

Fixes: 29765ae224e4 ("context_tracking: Rename context_tracking_user_enter/exit() to user_enter/exit_callable()")
Signed-off-by: Max Filippov <[email protected]>
---
arch/xtensa/kernel/entry.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index e3eae648ba2e..d72bcafae90c 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -458,7 +458,7 @@ KABI_W or a3, a3, a2
#ifdef CONFIG_CONTEXT_TRACKING
l32i abi_tmp0, a1, PT_PS
bbci.l abi_tmp0, PS_UM_BIT, 1f
- abi_call context_tracking_user_exit
+ abi_call user_exit_callable
1:
#endif

@@ -545,7 +545,7 @@ common_exception_return:

.Lexit_tif_loop_user:
#ifdef CONFIG_CONTEXT_TRACKING
- abi_call context_tracking_user_enter
+ abi_call user_enter_callable
#endif
#ifdef CONFIG_HAVE_HW_BREAKPOINT
_bbci.l abi_saved0, TIF_DB_DISABLED, 1f
--
2.30.2