[SPARC]: Remove schedule_tail ifdefs.

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 2e6d220cd8f08649b39bf21eb619bc57f9b25ca7..9773bb5a4db57288d715dae298164f0ccafe9845 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1475,11 +1475,8 @@ linux_syscall_trace:
 
        .globl  C_LABEL(ret_from_fork)
 C_LABEL(ret_from_fork):
-#if CONFIG_SMP || CONFIG_PREEMPT
-/* XXX Wrong location: call schedule_tail in every ret_sys_call. */
        call    schedule_tail
         mov    %g3, %o0
-#endif
        b       C_LABEL(ret_sys_call)
         ld     [%sp + REGWIN_SZ + PT_I0], %o0
 

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 0751c54ea8cbe3c092edcab884359e9bb490aa91..8b617acad3afc503d8aa414b3315a0d0cdf63a25 100644 (file)
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1619,10 +1619,8 @@ ret_from_syscall:
                 */
                andn            %o7, _TIF_NEWCHILD, %l0
                stx             %l0, [%g6 + TI_FLAGS]
-#if CONFIG_SMP || CONFIG_PREEMPT
                call            schedule_tail
                 mov            %g5, %o0
-#endif
                andcc           %l0, _TIF_PERFCTR, %g0
                be,pt           %icc, 1f
                 nop