hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/mips/kernel/entry.S
....@@ -19,7 +19,7 @@
1919 #include <asm/thread_info.h>
2020 #include <asm/war.h>
2121
22
-#ifndef CONFIG_PREEMPT
22
+#ifndef CONFIG_PREEMPTION
2323 #define resume_kernel restore_all
2424 #else
2525 #define __ret_from_irq ret_from_exception
....@@ -27,7 +27,7 @@
2727
2828 .text
2929 .align 5
30
-#ifndef CONFIG_PREEMPT
30
+#ifndef CONFIG_PREEMPTION
3131 FEXPORT(ret_from_exception)
3232 local_irq_disable # preempt stop
3333 b __ret_from_irq
....@@ -53,20 +53,19 @@
5353 bnez t0, work_pending
5454 j restore_all
5555
56
-#ifdef CONFIG_PREEMPT
56
+#ifdef CONFIG_PREEMPTION
5757 resume_kernel:
5858 local_irq_disable
5959 lw t0, TI_PRE_COUNT($28)
6060 bnez t0, restore_all
61
-need_resched:
6261 LONG_L t0, TI_FLAGS($28)
6362 andi t1, t0, _TIF_NEED_RESCHED
6463 beqz t1, restore_all
6564 LONG_L t0, PT_STATUS(sp) # Interrupts off?
6665 andi t0, 1
6766 beqz t0, restore_all
68
- jal preempt_schedule_irq
69
- b need_resched
67
+ PTR_LA ra, restore_all
68
+ j preempt_schedule_irq
7069 #endif
7170
7271 FEXPORT(ret_from_kernel_thread)
....@@ -170,8 +169,8 @@
170169 jal syscall_trace_leave
171170 b resume_userspace
172171
173
-#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) || \
174
- defined(CONFIG_MIPS_MT)
172
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR5) || \
173
+ defined(CONFIG_CPU_MIPSR6) || defined(CONFIG_MIPS_MT)
175174
176175 /*
177176 * MIPS32R2 Instruction Hazard Barrier - must be called
....@@ -184,4 +183,4 @@
184183 nop
185184 END(mips_ihb)
186185
187
-#endif /* CONFIG_CPU_MIPSR2 or CONFIG_CPU_MIPSR6 or CONFIG_MIPS_MT */
186
+#endif /* CONFIG_CPU_MIPSR2 - CONFIG_CPU_MIPSR6 or CONFIG_MIPS_MT */