patch-2.2.14 linux/kernel/sched.c

• Lines: 21
• Date: Tue Jan 4 10:12:25 2000
• Orig file: v2.2.13/linux/kernel/sched.c
• Orig date: Tue Jan 4 11:10:42 2000

diff -u --recursive --new-file v2.2.13/linux/kernel/sched.c linux/kernel/sched.c
@@ -78,7 +78,7 @@
 long time_adjust = 0;
 long time_adjust_step = 0;
 
-unsigned long event = 0;
+unsigned long global_event = 0;
 
 extern int do_setitimer(int, struct itimerval *, struct itimerval *);
 unsigned int * prof_buffer = NULL;
@@ -862,7 +862,11 @@
 
 scheduling_in_interrupt:
 	printk("Scheduling in interrupt\n");
+#ifdef CONFIG_ARCH_S390
+	asm volatile ( ".word 0\n" );
+#else
 	*(int *)0 = 0;
+#endif /* CONFIG_ARCH_S390 */
 	return;
 }