From b15c25d62f8a9c74dc4023c3d557d1db4cb9fe48 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 19 Aug 2008 20:50:04 -0700 Subject: [PATCH] --- yaml --- r: 116411 b: refs/heads/master c: bfea1238beac9d306eeac081c67de5ca6aec4c7a h: refs/heads/master i: 116409: f5ed6f89bfa7e1c4de27aca2db2488ff2653b796 116407: 44fe7faf86c1940f24e993ff4ae7586bf31f8666 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/irq_vectors.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b1d4c527da8c..e585db4c78fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71f521bbaf375b685aeea20c6b0ed8600cd6edfe +refs/heads/master: bfea1238beac9d306eeac081c67de5ca6aec4c7a diff --git a/trunk/include/asm-x86/irq_vectors.h b/trunk/include/asm-x86/irq_vectors.h index c5d2d767a1f3..cb09802ce651 100644 --- a/trunk/include/asm-x86/irq_vectors.h +++ b/trunk/include/asm-x86/irq_vectors.h @@ -116,7 +116,6 @@ # else # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) # endif -# define NR_IRQ_VECTORS NR_IRQS #elif !defined(CONFIG_X86_VOYAGER) @@ -124,23 +123,15 @@ # define NR_IRQS 224 -# if (224 >= 32 * NR_CPUS) -# define NR_IRQ_VECTORS NR_IRQS -# else -# define NR_IRQ_VECTORS (32 * NR_CPUS) -# endif - # else /* IO_APIC || PARAVIRT */ # define NR_IRQS 16 -# define NR_IRQ_VECTORS NR_IRQS # endif #else /* !VISWS && !VOYAGER */ # define NR_IRQS 224 -# define NR_IRQ_VECTORS NR_IRQS #endif /* VISWS */