From 52eedf45eb64977e63502a2694b9b51197ede29f Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 30 Jul 2004 19:19:03 +0000 Subject: [PATCH] Fix the merge fix --- kernel/sched.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 5d251348a..fa04c39c8 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -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; -- 2.47.0