archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <>
To: Linus Torvalds <>,
	Alan Cox <>
Cc: Linux Kernel Development <>,
	Geert Uytterhoeven <>
Subject: [PATCH] M68k ret_from_fork
Date: Sat, 26 Jul 2003 16:51:59 +0200	[thread overview]
Message-ID: <200307261451.h6QEpxKM002478@callisto.of.borg> (raw)

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
-#ifdef CONFIG_SMP
+	movel	%d1,%sp@-
 	jsr	schedule_tail
+	addql	#4,%sp
 	jra	ret_from_exception



Geert Uytterhoeven -- There's lots of Linux beyond ia32 --

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

                 reply	other threads:[~2003-07-26 14:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200307261451.h6QEpxKM002478@callisto.of.borg \ \ \ \ \
    --subject='Re: [PATCH] M68k ret_from_fork' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).