ixgb: fix rare early tso completion

[linux-2.6] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 2e8a146dd0660a8e8a914ee0936e66832934b33d..4c64f85698aee2205c442f3fec09d18a3db5d4a3 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -713,7 +713,7 @@ static void __activate_task(task_t *p, runqueue_t *rq)
 {
        prio_array_t *target = rq->active;
 
-       if (unlikely(batch_task(p) || expired_starving(rq)))
+       if (unlikely(batch_task(p) || (expired_starving(rq) && !rt_task(p))))
                target = rq->expired;
        enqueue_task(p, target);
        rq->nr_running++;
@@ -4814,7 +4814,7 @@ static int migration_call(struct notifier_block *nfb, unsigned long action,
 /* Register at highest priority so that task migration (migrate_all_tasks)
  * happens before everything else.
  */
-static struct notifier_block __devinitdata migration_notifier = {
+static struct notifier_block migration_notifier = {
        .notifier_call = migration_call,
        .priority = 10
 };