[Adeos-main] [PATCH] cleanup legacy sched hacks

[Adeos-main] [PATCH] cleanup legacy sched hacks

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]

I don't think we need those two legacy hacks anymore as we killed
preempt_disable/enable calls over non-root domain. I converted them
into context checks and got no warnings so far.

---
 kernel/sched.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Index: linux-2.6.20/kernel/sched.c
===================================================================
--- linux-2.6.20.orig/kernel/sched.c
+++ linux-2.6.20/kernel/sched.c
@@ -3422,10 +3422,8 @@ asmlinkage void __sched schedule(void)
 	long *switch_count;
 	struct rq *rq;
 
-#ifdef CONFIG_IPIPE
-	if (unlikely(!ipipe_root_domain_p))
-		return;
-#endif /* CONFIG_IPIPE */
+	ipipe_check_context(ipipe_root_domain);
+
 	/*
 	 * Test if we are atomic.  Since do_exit() needs to call into
 	 * schedule() atomically, we ignore that path for now.
@@ -3600,11 +3598,8 @@ asmlinkage void __sched preempt_schedule
 	struct task_struct *task = current;
 	int saved_lock_depth;
 #endif
-#ifdef CONFIG_IPIPE
-	/* Do not reschedule over non-Linux domains. */
-	if (unlikely(!ipipe_root_domain_p))
-		return;
-#endif /* CONFIG_IPIPE */
+	ipipe_check_context(ipipe_root_domain);
+
 	/*
 	 * If there is a non-zero preempt_count or interrupts are disabled,
 	 * we do not want to preempt the current task.  Just return..


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

Re: [Adeos-main] [PATCH] cleanup legacy sched hacks

[Philippe Gerum]

On Sun, 2007-05-13 at 12:18 +0200, Jan Kiszka wrote:
> I don't think we need those two legacy hacks anymore as we killed
> preempt_disable/enable calls over non-root domain. I converted them
> into context checks and got no warnings so far.

Merged, thanks.

-- 
Philippe.