x86, irqs, voyager: remove Voyager quirk (3e92ab3d) · Commits · 戴 / test

arch/x86/include/asm/irq_vectors.h

+3 −11

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@

		#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 */

		@@ -117,22 +117,14 @@
		# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
		# endif
		#else

		# define NR_IRQS \
		((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \
		(NR_VECTORS + (8 * NR_CPUS)) : \
		(NR_VECTORS + (32 * MAX_IO_APICS))) \

		(NR_VECTORS + (32 * MAX_IO_APICS)))
		#endif

		#elif defined(CONFIG_X86_VOYAGER)

		# define NR_IRQS 224

		#else /* IO_APIC \|\| VOYAGER */

		#else /* !CONFIG_X86_IO_APIC: */
		# define NR_IRQS 16

		#endif

		#endif /* _ASM_X86_IRQ_VECTORS_H */