linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] M68k ret_from_fork
@ 2003-07-26 14:51 Geert Uytterhoeven
  0 siblings, 0 replies; only message in thread
From: Geert Uytterhoeven @ 2003-07-26 14:51 UTC (permalink / raw)
  To: Linus Torvalds, Alan Cox; +Cc: Linux Kernel Development, Geert Uytterhoeven

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-07-26 14:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-26 14:51 [PATCH] M68k ret_from_fork Geert Uytterhoeven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).