| .. | .. |
|---|
| 19 | 19 | #include <asm/thread_info.h> |
|---|
| 20 | 20 | #include <asm/war.h> |
|---|
| 21 | 21 | |
|---|
| 22 | | -#ifndef CONFIG_PREEMPT |
|---|
| 22 | +#ifndef CONFIG_PREEMPTION |
|---|
| 23 | 23 | #define resume_kernel restore_all |
|---|
| 24 | 24 | #else |
|---|
| 25 | 25 | #define __ret_from_irq ret_from_exception |
|---|
| .. | .. |
|---|
| 27 | 27 | |
|---|
| 28 | 28 | .text |
|---|
| 29 | 29 | .align 5 |
|---|
| 30 | | -#ifndef CONFIG_PREEMPT |
|---|
| 30 | +#ifndef CONFIG_PREEMPTION |
|---|
| 31 | 31 | FEXPORT(ret_from_exception) |
|---|
| 32 | 32 | local_irq_disable # preempt stop |
|---|
| 33 | 33 | b __ret_from_irq |
|---|
| .. | .. |
|---|
| 53 | 53 | bnez t0, work_pending |
|---|
| 54 | 54 | j restore_all |
|---|
| 55 | 55 | |
|---|
| 56 | | -#ifdef CONFIG_PREEMPT |
|---|
| 56 | +#ifdef CONFIG_PREEMPTION |
|---|
| 57 | 57 | resume_kernel: |
|---|
| 58 | 58 | local_irq_disable |
|---|
| 59 | 59 | lw t0, TI_PRE_COUNT($28) |
|---|
| 60 | 60 | bnez t0, restore_all |
|---|
| 61 | | -need_resched: |
|---|
| 62 | 61 | LONG_L t0, TI_FLAGS($28) |
|---|
| 63 | 62 | andi t1, t0, _TIF_NEED_RESCHED |
|---|
| 64 | 63 | beqz t1, restore_all |
|---|
| 65 | 64 | LONG_L t0, PT_STATUS(sp) # Interrupts off? |
|---|
| 66 | 65 | andi t0, 1 |
|---|
| 67 | 66 | beqz t0, restore_all |
|---|
| 68 | | - jal preempt_schedule_irq |
|---|
| 69 | | - b need_resched |
|---|
| 67 | + PTR_LA ra, restore_all |
|---|
| 68 | + j preempt_schedule_irq |
|---|
| 70 | 69 | #endif |
|---|
| 71 | 70 | |
|---|
| 72 | 71 | FEXPORT(ret_from_kernel_thread) |
|---|
| .. | .. |
|---|
| 170 | 169 | jal syscall_trace_leave |
|---|
| 171 | 170 | b resume_userspace |
|---|
| 172 | 171 | |
|---|
| 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) |
|---|
| 175 | 174 | |
|---|
| 176 | 175 | /* |
|---|
| 177 | 176 | * MIPS32R2 Instruction Hazard Barrier - must be called |
|---|
| .. | .. |
|---|
| 184 | 183 | nop |
|---|
| 185 | 184 | END(mips_ihb) |
|---|
| 186 | 185 | |
|---|
| 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 */ |
|---|