Skip to contentSkip to conversation

irq consolidation, new attempt (i386 part)

PATCH New Andrey Panin 1 participant 1 message Jun 30, 2003

lore
Share & tools
lore

Andrey Panin

author
#0 lore raw

PATCH 1/1 irq consolidation, new attempt (i386 part)

Hi all,

i386 specific patch of irq handling code consolidation patchset. Patch is against 2.5.73. Compiles and works.

Please take a look.

Best regards.

Signature · 2 lines
Andrey Panin		| Linux and UNIX system administrator
[email protected]		| PGP key: wwwkeys.pgp.net
arch/i386/Kconfig +4 -0
diff --minimal -urN -X /usr/share/dontdiff linux-2.5.73.vanilla/arch/i386/Kconfig linux-2.5.73/arch/i386/Kconfig
@@ -18,6 +18,10 @@
 	bool
 	default y
 
+config GENERIC_IRQ
+	bool
+	default y
+
 config SBUS
 	bool
arch/i386/kernel/io_apic.c +2 -4
diff --minimal -urN -X /usr/share/dontdiff linux-2.5.73.vanilla/arch/i386/kernel/io_apic.c linux-2.5.73/arch/i386/kernel/io_apic.c
@@ -285,8 +285,6 @@
 #  define Dprintk(x...) 
 # endif
 
-extern unsigned long irq_affinity[NR_IRQS];
-
 static int __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
 
 #define IRQBALANCE_CHECK_ARCH -999

@@ -355,7 +353,7 @@
 	if (irqbalance_disabled)
 		return; 
 
-	allowed_mask = cpu_online_map & irq_affinity[irq];
+	allowed_mask = cpu_online_map & irq_desc(irq)->irq_affinity;
 	new_cpu = move(cpu, allowed_mask, now, 1);
 	if (cpu != new_cpu) {
 		irq_desc_t *desc = irq_desc + irq;

@@ -548,7 +546,7 @@
 					CPU_IRQ(cpu_sibling_map[min_loaded]))
 		min_loaded = cpu_sibling_map[min_loaded];
 
-	allowed_mask = cpu_online_map & irq_affinity[selected_irq];
+	allowed_mask = cpu_online_map & irq_desc(selected_irq)->irq_affinity;
 	target_cpu_mask = 1 << min_loaded;
 
 	if (target_cpu_mask & allowed_mask) {
arch/i386/kernel/irq.c +4 -860

912 lines not on this page · raw message

include/asm-i386/hw_irq.h +41 -0

51 lines not on this page · raw message