--- linux-2.6.1-base/kernel/sched.c	2004-01-09 22:57:04.000000000 +1100
+++ linux-2.6.1-htn2/kernel/sched.c	2004-02-02 20:01:17.042394133 +1100
@@ -208,6 +208,7 @@ struct runqueue {
 	atomic_t *node_nr_running;
 	int prev_node_load[MAX_NUMNODES];
 #endif
+	unsigned long cpu;
 	task_t *migration_thread;
 	struct list_head migration_queue;
 
@@ -221,6 +222,10 @@ static DEFINE_PER_CPU(struct runqueue, r
 #define task_rq(p)		cpu_rq(task_cpu(p))
 #define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
 
+#define ht_active		(cpu_has_ht && smp_num_siblings > 1)
+#define ht_siblings(cpu1, cpu2)	(ht_active && \
+	cpu_sibling_map[(cpu1)] == (cpu2))
+
 /*
  * Default context-switch locking:
  */
@@ -1380,6 +1385,10 @@ void scheduler_tick(int user_ticks, int 
 			cpustat->iowait += sys_ticks;
 		else
 			cpustat->idle += sys_ticks;
+		if (rq->nr_running) {
+			resched_task(p);
+			goto out;
+		}
 		rebalance_tick(rq, 1);
 		return;
 	}
@@ -1536,6 +1545,20 @@ need_resched:
 		if (!rq->nr_running) {
 			next = rq->idle;
 			rq->expired_timestamp = 0;
+#ifdef CONFIG_SMP
+			if (ht_active) {
+				/*
+				 * If a HT sibling task is sleeping due to
+				 * priority reasons wake it up now
+				 */
+				runqueue_t *htrq;
+				htrq = cpu_rq(cpu_sibling_map[(rq->cpu)]);
+
+				if (htrq->curr == htrq->idle &&
+					htrq->nr_running)
+						resched_task(htrq->idle);
+			}
+#endif
 			goto switch_tasks;
 		}
 	}
@@ -1555,6 +1578,42 @@ need_resched:
 	queue = array->queue + idx;
 	next = list_entry(queue->next, task_t, run_list);
 
+#ifdef CONFIG_SMP
+	if (ht_active) {
+		runqueue_t *htrq;
+		htrq = cpu_rq(cpu_sibling_map[(rq->cpu)]);
+		task_t *htcurr;
+		htcurr = htrq->curr;
+
+		/*
+		 * If a user task with lower static priority than the
+		 * running task on the hyperthread sibling is trying
+		 * to schedule, delay it till there is equal timeslice
+		 * left of the hyperthread task to prevent a lower priority
+		 * task from using an unfair proportion of the physical
+		 * cpu's resources.
+		 */
+		if (next->mm && htcurr->mm && !rt_task(next) && 
+			((next->static_prio > 
+			htcurr->static_prio && htcurr->time_slice > 
+			task_timeslice(next)) || rt_task(htcurr))) {
+				next = rq->idle;
+				goto switch_tasks;
+		}
+		
+		/*
+		 * Reschedule a lower priority task
+		 * on the HT sibling, or wake it up if it has been
+		 * put to sleep for priority reasons.
+		 */
+		if ((htcurr != htrq->idle && 
+			htcurr->static_prio > next->static_prio) ||
+			(rt_task(next) && !rt_task(htcurr)) ||
+			(htcurr == htrq->idle && htrq->nr_running))
+				resched_task(htcurr);
+	}
+#endif
+
 	if (next->activated > 0) {
 		unsigned long long delta = now - next->timestamp;
 
@@ -2809,6 +2868,7 @@ void __init sched_init(void)
 		prio_array_t *array;
 
 		rq = cpu_rq(i);
+		rq->cpu = (unsigned long)(i);
 		rq->active = rq->arrays;
 		rq->expired = rq->arrays + 1;
 		spin_lock_init(&rq->lock);