diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/mips/kernel/entry.S | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/mips/kernel/entry.S')
| -rw-r--r-- | arch/mips/kernel/entry.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index e29598ae939d..ffa331029e08 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S | |||
| @@ -79,11 +79,6 @@ FEXPORT(syscall_exit) | |||
| 79 | 79 | ||
| 80 | FEXPORT(restore_all) # restore full frame | 80 | FEXPORT(restore_all) # restore full frame |
| 81 | #ifdef CONFIG_MIPS_MT_SMTC | 81 | #ifdef CONFIG_MIPS_MT_SMTC |
| 82 | /* Detect and execute deferred IPI "interrupts" */ | ||
| 83 | LONG_L s0, TI_REGS($28) | ||
| 84 | LONG_S sp, TI_REGS($28) | ||
| 85 | jal deferred_smtc_ipi | ||
| 86 | LONG_S s0, TI_REGS($28) | ||
| 87 | #ifdef CONFIG_MIPS_MT_SMTC_IM_BACKSTOP | 82 | #ifdef CONFIG_MIPS_MT_SMTC_IM_BACKSTOP |
| 88 | /* Re-arm any temporarily masked interrupts not explicitly "acked" */ | 83 | /* Re-arm any temporarily masked interrupts not explicitly "acked" */ |
| 89 | mfc0 v0, CP0_TCSTATUS | 84 | mfc0 v0, CP0_TCSTATUS |
| @@ -112,6 +107,11 @@ FEXPORT(restore_all) # restore full frame | |||
| 112 | xor t0, t0, t3 | 107 | xor t0, t0, t3 |
| 113 | mtc0 t0, CP0_TCCONTEXT | 108 | mtc0 t0, CP0_TCCONTEXT |
| 114 | #endif /* CONFIG_MIPS_MT_SMTC_IM_BACKSTOP */ | 109 | #endif /* CONFIG_MIPS_MT_SMTC_IM_BACKSTOP */ |
| 110 | /* Detect and execute deferred IPI "interrupts" */ | ||
| 111 | LONG_L s0, TI_REGS($28) | ||
| 112 | LONG_S sp, TI_REGS($28) | ||
| 113 | jal deferred_smtc_ipi | ||
| 114 | LONG_S s0, TI_REGS($28) | ||
| 115 | #endif /* CONFIG_MIPS_MT_SMTC */ | 115 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 116 | .set noat | 116 | .set noat |
| 117 | RESTORE_TEMP | 117 | RESTORE_TEMP |