[PATCH] fix visws breakage in 2.6.0-test9
From: Andrey Panin
Date: Thu Nov 06 2003 - 06:36:42 EST
Hi all,
attached patch fixes visws subarch which was broken by
asm-i386/hw_irq.h changes in 2.6.0-test9.
Please apply.
Best regards.
--
Andrey Panin | Linux and UNIX system administrator
pazke@xxxxxxxxx | PGP key: wwwkeys.pgp.net
diff -urN -X /usr/share/dontdiff linux.vanilla/arch/i386/mach-visws/visws_apic.c linux/arch/i386/mach-visws/visws_apic.c
--- linux.vanilla/arch/i386/mach-visws/visws_apic.c 2003-10-27 14:10:03.000000000 +0300
+++ linux/arch/i386/mach-visws/visws_apic.c 2003-10-31 15:42:06.000000000 +0300
@@ -31,9 +31,6 @@
#include "irq_vectors.h"
-int irq_vector[NR_IRQS] = { FIRST_EXTERNAL_VECTOR, 0 };
-
-
static spinlock_t cobalt_lock = SPIN_LOCK_UNLOCKED;
/*
@@ -42,7 +39,7 @@
*/
static inline void co_apic_set(int entry, int irq)
{
- co_apic_write(CO_APIC_LO(entry), CO_APIC_LEVEL | irq_vector[irq]);
+ co_apic_write(CO_APIC_LO(entry), CO_APIC_LEVEL | (irq + FIRST_EXTERNAL_VECTOR));
co_apic_write(CO_APIC_HI(entry), 0);
}
@@ -299,7 +296,6 @@
else if (IS_CO_APIC(i)) {
irq_desc[i].handler = &cobalt_irq_type;
}
- irq_vector[i] = i + FIRST_EXTERNAL_VECTOR;
}
setup_irq(CO_IRQ_8259, &master_action);
Attachment:
signature.asc
Description: Digital signature