Fix the merge fix
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 30 Jul 2004 19:19:03 +0000 (19:19 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 30 Jul 2004 19:19:03 +0000 (19:19 +0000)
kernel/sched.c

index 5d25134..fa04c39 100644 (file)
@@ -366,9 +366,6 @@ static inline struct task_struct * rq_get_next_task(struct runqueue* rq)
                array = queue->active;
                //check switch active/expired queue
                if (unlikely(!queue->active->nr_active)) {
-                       prio_array_t *array;
-                      
-                       array = queue->active;
                        queue->active = queue->expired;
                        queue->expired = array;
                        queue->expired_timestamp = 0;