[PATCH] genirq: cleanup: merge irq_affinity[] into irq_desc[]

[linux-2.6-block.git] / kernel / irq / proc.c

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 90fe05f23e692ba3e5fdd4b50e18c47fd1a139c8..847b98a611e0335183031c7a3f1fc8e9a3f71842 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -36,7 +36,7 @@ void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 {
        set_balance_irq_affinity(irq, mask_val);
-       irq_affinity[irq] = mask_val;
+       irq_desc[irq].affinity = mask_val;
        irq_desc[irq].chip->set_affinity(irq, mask_val);
 }
 #endif
@@ -44,7 +44,7 @@ void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 static int irq_affinity_read_proc(char *page, char **start, off_t off,
                                  int count, int *eof, void *data)
 {
-       int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]);
+       int len = cpumask_scnprintf(page, count, irq_desc[(long)data].affinity);
 
        if (count - len < 2)
                return -EINVAL;