[PATCH] M68k ret_from_fork

From: Geert Uytterhoeven (geert@linux-m68k.org)
Date: Sat Jul 26 2003 - 09:51:59 EST


M68k: Revert to 2.4 behavior in ret_from_fork (always call schedule_tail,
regardless of CONFIG_SMP), as suggested by Andreas Schwab.

This removes the warnings from sched.c (from Sam Creasey).

--- linux-2.6.x/arch/m68k/kernel/entry.S Tue May 27 19:02:32 2003
+++ linux-m68k-2.6.x/arch/m68k/kernel/entry.S Fri Jul 18 16:23:57 2003
@@ -68,11 +68,13 @@
         addql #4,%sp
         jra ret_from_exception
 
- | schedule_tail is only used with CONFIG_SMP
+ | After a fork we jump here directly from resume,
+ | so that %d1 contains the previous task
+ | schedule_tail now used regardless of CONFIG_SMP
 ENTRY(ret_from_fork)
-#ifdef CONFIG_SMP
+ movel %d1,%sp@-
         jsr schedule_tail
-#endif
+ addql #4,%sp
         jra ret_from_exception
 
 badsys:

Gr{oetje,eeting}s,

                                                Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:29 EST