summaryrefslogtreecommitdiffstats
path: root/include/linux/irq.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-06-29 02:24:42 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-29 10:26:22 -0700
commit4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6 (patch)
treeefee6dfbfcfd08fbe1f2462afb299aeb5624354b /include/linux/irq.h
parent71d218b75fa91219c6bd310fbdd257dfbcac6c88 (diff)
downloadlinux-4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6.tar.gz
linux-4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6.tar.bz2
linux-4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6.zip
[PATCH] genirq: cleanup: merge irq_dir[], smp_affinity_entry[] into irq_desc[]
Consolidation: remove the irq_dir[NR_IRQS] and the smp_affinity_entry[NR_IRQS] arrays and move them into the irq_desc[] array. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r--include/linux/irq.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index c13f23dee286..1022c5d42546 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -61,6 +61,8 @@ struct hw_interrupt_type {
typedef struct hw_interrupt_type hw_irq_controller;
+struct proc_dir_entry;
+
/*
* This is the "IRQ descriptor", which contains various information
* about the irq, including what kind of hardware handling it has,
@@ -83,6 +85,9 @@ struct irq_desc {
#if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)
unsigned int move_irq; /* need to re-target IRQ dest */
#endif
+#ifdef CONFIG_PROC_FS
+ struct proc_dir_entry *dir;
+#endif
} ____cacheline_aligned;
extern struct irq_desc irq_desc[NR_IRQS];