Skip to content

Commit cc3e3d3

Browse files
DispatchCodetsbogend
authored andcommitted
MIPS: rename rollback_handler with skipover_handler
Recently the rollback region has been changed into an idle interrupt region [1]. This patch make the appropriate changes renaming functions and macro, to reflect the change. [1] https://lore.kernel.org/linux-mips/20250403161143.361461-2-marco.crivellari@suse.com/ Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent b713f27 commit cc3e3d3

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

arch/mips/include/asm/idle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern void (*cpu_wait)(void);
99
extern asmlinkage void r4k_wait(void);
1010
extern void r4k_wait_irqoff(void);
1111

12-
static inline int using_rollback_handler(void)
12+
static inline int using_skipover_handler(void)
1313
{
1414
return cpu_wait == r4k_wait;
1515
}

arch/mips/kernel/genex.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LEAF(r4k_wait)
116116
* If an interrupt lands here, before going idle on the next
117117
* instruction, we must *NOT* go idle since the interrupt could
118118
* have set TIF_NEED_RESCHED or caused a timer to need resched.
119-
* Fall through -- see rollback_handler below -- and have the
119+
* Fall through -- see skipover_handler below -- and have the
120120
* idle loop take care of things.
121121
*/
122122
1: .fill 0
@@ -139,8 +139,8 @@ r4k_wait_exit:
139139
END(r4k_wait)
140140
.previous
141141

142-
.macro BUILD_ROLLBACK_PROLOGUE handler
143-
FEXPORT(rollback_\handler)
142+
.macro BUILD_SKIPOVER_PROLOGUE handler
143+
FEXPORT(skipover_\handler)
144144
.set push
145145
.set noat
146146
MFC0 k0, CP0_EPC
@@ -156,7 +156,7 @@ r4k_wait_exit:
156156
.endm
157157

158158
.align 5
159-
BUILD_ROLLBACK_PROLOGUE handle_int
159+
BUILD_SKIPOVER_PROLOGUE handle_int
160160
NESTED(handle_int, PT_SIZE, sp)
161161
.cfi_signal_frame
162162
#ifdef CONFIG_TRACE_IRQFLAGS
@@ -276,7 +276,7 @@ NESTED(except_vec_ejtag_debug, 0, sp)
276276
* This prototype is copied to ebase + n*IntCtl.VS and patched
277277
* to invoke the handler
278278
*/
279-
BUILD_ROLLBACK_PROLOGUE except_vec_vi
279+
BUILD_SKIPOVER_PROLOGUE except_vec_vi
280280
NESTED(except_vec_vi, 0, sp)
281281
SAVE_SOME docfi=1
282282
SAVE_AT docfi=1

arch/mips/kernel/traps.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#include "access-helper.h"
7878

7979
extern void check_wait(void);
80-
extern asmlinkage void rollback_handle_int(void);
80+
extern asmlinkage void skipover_handle_int(void);
8181
extern asmlinkage void handle_int(void);
8282
extern asmlinkage void handle_adel(void);
8383
extern asmlinkage void handle_ades(void);
@@ -2066,7 +2066,7 @@ void *set_vi_handler(int n, vi_handler_t addr)
20662066
{
20672067
extern const u8 except_vec_vi[];
20682068
extern const u8 except_vec_vi_ori[], except_vec_vi_end[];
2069-
extern const u8 rollback_except_vec_vi[];
2069+
extern const u8 skipover_except_vec_vi[];
20702070
unsigned long handler;
20712071
unsigned long old_handler = vi_handlers[n];
20722072
int srssets = current_cpu_data.srsets;
@@ -2095,7 +2095,7 @@ void *set_vi_handler(int n, vi_handler_t addr)
20952095
change_c0_srsmap(0xf << n*4, 0 << n*4);
20962096
}
20972097

2098-
vec_start = using_rollback_handler() ? rollback_except_vec_vi :
2098+
vec_start = using_skipover_handler() ? skipover_except_vec_vi :
20992099
except_vec_vi;
21002100
#if defined(CONFIG_CPU_MICROMIPS) || defined(CONFIG_CPU_BIG_ENDIAN)
21012101
ori_offset = except_vec_vi_ori - vec_start + 2;
@@ -2426,8 +2426,8 @@ void __init trap_init(void)
24262426
if (board_be_init)
24272427
board_be_init();
24282428

2429-
set_except_vector(EXCCODE_INT, using_rollback_handler() ?
2430-
rollback_handle_int : handle_int);
2429+
set_except_vector(EXCCODE_INT, using_skipover_handler() ?
2430+
skipover_handle_int : handle_int);
24312431
set_except_vector(EXCCODE_MOD, handle_tlbm);
24322432
set_except_vector(EXCCODE_TLBL, handle_tlbl);
24332433
set_except_vector(EXCCODE_TLBS, handle_tlbs);

0 commit comments

Comments
 (0)