Re: [PATCH] x86: make NR_IRQS on 32bit is same to 64bit

["Yinghai Lu" <yhlu.kernel@gmail.com>]

On Wed, Nov 5, 2008 at 11:10 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Wed, Nov 5, 2008 at 11:03 PM, H. Peter Anvin <hpa@zytor.com> wrote:
>> Yinghai Lu wrote:
>>>
>>> On Wed, Nov 5, 2008 at 10:52 PM, H. Peter Anvin <hpa@zytor.com> wrote:
>>>>
>>>> Yinghai Lu wrote:
>>>>>>
>>>>>> Clean-up sidenote: i think we can now remove the VISWS #ifdef portion
>>>>>> for good? Mind sending a patch for that too?
>>>>>
>>>>> could remove CONFIG_PARAVIRT too.. Jeremy?
>>>>>
>>>> This seems like a bad idea, especially for the embedded guys.
>>>
>>> make one CONFIG_NR_IRQS for them before working out one dyna_array is
>>> get merged?
>>>
>>
>> Ah, sorry... I missed the context and thought you meant removing
>> CONFIG_PARAVIRT in general.
>
> I mean make NR_IRQS bigger like IO_APIC is set when CONFIG_PARAVIRT is set.
>
like

diff --git a/arch/x86/include/asm/irq_vectors.h
b/arch/x86/include/asm/irq_vectors.h
index 503aadc..0005adb 100644
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -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