patch-1.3.14 linux/kernel/sched.c

• Lines: 42
• Date: Mon Jul 31 09:19:52 1995
• Orig file: v1.3.13/linux/kernel/sched.c
• Orig date: Thu Jul 27 10:13:17 1995

diff -u --recursive --new-file v1.3.13/linux/kernel/sched.c linux/kernel/sched.c
@@ -183,7 +183,7 @@
 
 	if (intr_count) {
 		printk("Aiee: scheduling in interrupt\n");
-		intr_count = 0;
+		return;
 	}
 	run_task_queue(&tq_scheduler);
 
@@ -233,7 +233,7 @@
 		kstat.context_swtch++;
 		if (timeout) {
 			init_timer(&timer);
-			timer.expires = timeout - jiffies;
+			timer.expires = timeout;
 			timer.data = (unsigned long) current;
 			timer.function = process_timeout;
 			add_timer(&timer);
@@ -369,7 +369,6 @@
 	}
 #endif
 	p = &timer_head;
-	timer->expires += jiffies;
 	save_flags(flags);
 	cli();
 	do {
@@ -397,7 +396,6 @@
 			timer->prev->next = timer->next;
 			timer->next = timer->prev = NULL;
 			restore_flags(flags);
-			timer->expires -= jiffies;
 			return 1;
 		}
 	}
@@ -414,7 +412,6 @@
 		timer->prev->next = timer->next;
 		timer->next = timer->prev = NULL;
 		restore_flags(flags);
-		timer->expires -= jiffies;
 		return 1;
 	}
 	restore_flags(flags);