aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/irq_vectors.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-31 02:50:46 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-31 04:21:24 +0100
commitc379698fdac7cb65c96dec549850ce606dd6ceba (patch)
tree7023e1e68ea659d288fa04a110b4e01aaf27e6b9 /arch/x86/include/asm/irq_vectors.h
parent9fc2e79d4f239c1c1dfdab7b10854c7588b39d9a (diff)
downloadlinux-c379698fdac7cb65c96dec549850ce606dd6ceba.tar.gz
x86, irq_vectors.h: remove needless includes
Reduce include file dependencies a bit - remove the two headers that are included in irq_vectors.h. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/irq_vectors.h')
-rw-r--r--arch/x86/include/asm/irq_vectors.h22
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
index 5f7d6a1e3d2..ec87910025d 100644
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -1,8 +1,6 @@
#ifndef _ASM_X86_IRQ_VECTORS_H
#define _ASM_X86_IRQ_VECTORS_H
-#include <linux/threads.h>
-
/*
* Linux IRQ vector layout.
*
@@ -131,22 +129,18 @@
#define NR_IRQS_LEGACY 16
#ifdef CONFIG_X86_IO_APIC
-
-#include <asm/apicnum.h> /* need MAX_IO_APICS */
-
-#ifndef CONFIG_SPARSE_IRQ
-# if NR_CPUS < MAX_IO_APICS
-# define NR_IRQS (NR_VECTORS + (32 * NR_CPUS))
+# ifndef CONFIG_SPARSE_IRQ
+# if NR_CPUS < MAX_IO_APICS
+# define NR_IRQS (NR_VECTORS + (32 * NR_CPUS))
+# else
+# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
+# endif
# else
-# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
-# endif
-#else
-# define NR_IRQS \
+# define NR_IRQS \
((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \
(NR_VECTORS + (8 * NR_CPUS)) : \
(NR_VECTORS + (32 * MAX_IO_APICS)))
-#endif
-
+# endif
#else /* !CONFIG_X86_IO_APIC: */
# define NR_IRQS 16
#endif