aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Travis <travis@sgi.com>2009-01-11 09:22:58 -0800
committerIngo Molnar <mingo@elte.hu>2009-01-11 19:13:45 +0100
commit92296c6d6e908c35fca287a21af27be814af9c75 (patch)
treeba4a85a77b5bb3b609348dafafb710d567d1810a /arch
parent542d865bbed4ce1f050f586e53cf1cfadda93766 (diff)
cpumask, irq: non-x86 build failures
Ingo Molnar wrote: > All non-x86 architectures fail to build: > > In file included from /home/mingo/tip/include/linux/random.h:11, > from /home/mingo/tip/include/linux/stackprotector.h:6, > from /home/mingo/tip/init/main.c:17: > /home/mingo/tip/include/linux/irqnr.h:26:63: error: asm/irq_vectors.h: No such file or directory Do not include asm/irq_vectors.h in generic code - it's not available on all architectures. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/apicdef.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 1a6454ef7f6..63134e31e8b 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -132,8 +132,12 @@
#define APIC_BASE_MSR 0x800
#define X2APIC_ENABLE (1UL << 10)
-/* get MAX_IO_APICS */
-#include <asm/apicnum.h>
+#ifdef CONFIG_X86_32
+# define MAX_IO_APICS 64
+#else
+# define MAX_IO_APICS 128
+# define MAX_LOCAL_APIC 32768
+#endif
/*
* All x86-64 systems are xAPIC compatible.