Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7db282fa authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: remove VISWS and PARAVIRT around NR_IRQS puzzle 



Impact: fix warning message when PARAVIRT is set in config

Remove stale #ifdef components from our IRQ sizing logic.
x86/Voyager is the only holdout.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent da85f865

arch/x86/include/asm/irq_vectors.h

+3 −3
Original line number Diff line number Diff line
@@ -101,18 +101,18 @@ 
#define LAST_VM86_IRQ		15

#define invalid_vm86_irq(irq)	((irq) < 3 || (irq) > 15)



#if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_PARAVIRT) && !defined(CONFIG_X86_VISWS) && !defined(CONFIG_X86_VOYAGER)

#if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER)

# 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



#elif defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS) || defined(CONFIG_X86_VOYAGER)

#elif defined(CONFIG_X86_VOYAGER)



# define NR_IRQS		224



#else /* IO_APIC || PARAVIRT */

#else /* IO_APIC || VOYAGER */



# define NR_IRQS		16