evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86, irqs, voyager: remove Voyager quirk

Browse source 
Remove a Voyager complication from the generic irq_vectors.h header.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-31 02:21:42 +01:00
parent ed74ca6d5a
commit 3e92ab3d7e
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/x86/include/asm/irq_vectors.h
View file

@ -106,7 +106,7 @@
#define NR_IRQS_LEGACY 16 #define NR_IRQS_LEGACY 16
#if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER) #ifdef CONFIG_X86_IO_APIC
#include <asm/apicnum.h> /* need MAX_IO_APICS */ #include <asm/apicnum.h> /* need MAX_IO_APICS */
@ -117,22 +117,14 @@
# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
# endif # endif
#else #else
# define NR_IRQS \ # define NR_IRQS \
((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \ ((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \
(NR_VECTORS + (8 * NR_CPUS)) : \ (NR_VECTORS + (8 * NR_CPUS)) : \
(NR_VECTORS + (32 * MAX_IO_APICS))) \ (NR_VECTORS + (32 * MAX_IO_APICS)))
#endif #endif
#elif defined(CONFIG_X86_VOYAGER) #else /* !CONFIG_X86_IO_APIC: */
# define NR_IRQS 224
#else /* IO_APIC || VOYAGER */
# define NR_IRQS 16 # define NR_IRQS 16
#endif #endif
#endif /* _ASM_X86_IRQ_VECTORS_H */ #endif /* _ASM_X86_IRQ_VECTORS_H */