[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel interrupt.c,1.8,1.9

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv15841/arch/vax/kernel

Modified Files:
	interrupt.c 
Log Message:
added irq_enter / irq_exit for consistency sake with everyone else in 2.4
(might be useful at some stage)

Changed in_softirq() to softirq_active(cpu)&softirq_mask(cpu)
(again what everyone else seems to be doing .. also made networking work
so can't be all bad :-))


Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- interrupt.c	2001/02/22 22:21:31	1.8
+++ interrupt.c	2001/02/22 23:55:27	1.9
@@ -265,16 +265,20 @@
 {
 	int flags;
 	int status;
-
+	int cpu;
 	/* Fake a single-priority-level interrupt system by raising IPL
 	   to 31 for _any_ interrupt.  This is such a waste of the VAX's
 	   hardware capabilities... */
 
+	cpu=smp_processor_id();
+	irq_enter(cpu);
+	
 	save_and_cli(flags);
 
 	status = dispatch_irq(regs, vec);
+	irq_exit(cpu);
 	if (status) {
-		if (in_softirq()) {
+		if (softirq_active(cpu)&softirq_mask(cpu)) {
 			do_softirq();
 		}
 	}