X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fsched.c;h=a66e85639de2e541dd9726245cd344d3ea2d9f3b;hb=821b03ffac8851d6bc1d5530183d2ed25adae35d;hp=bebf9788f45ee6a4e3a08ab57ed94e1b17acf546;hpb=ea71a546706dfdad72462624394e1e472c6bf34f;p=linux-2.6

diff --git a/kernel/sched.c b/kernel/sched.c
index bebf9788f4..a66e85639d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5887,6 +5887,7 @@ static void migrate_dead_tasks(unsigned int dead_cpu)
 		next = pick_next_task(rq, rq->curr);
 		if (!next)
 			break;
+		next->sched_class->put_prev_task(rq, next);
 		migrate_dead(dead_cpu, next);
 
 	}
@@ -6877,7 +6878,12 @@ static int default_relax_domain_level = -1;
 
 static int __init setup_relax_domain_level(char *str)
 {
-	default_relax_domain_level = simple_strtoul(str, NULL, 0);
+	unsigned long val;
+
+	val = simple_strtoul(str, NULL, 0);
+	if (val < SD_LV_MAX)
+		default_relax_domain_level = val;
+
 	return 1;
 }
 __setup("relax_domain_level=", setup_relax_domain_level);