summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/apicnum.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-29 01:12:55 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-29 01:12:55 +0300
commit6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch)
tree9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /arch/x86/include/asm/apicnum.h
parent18e352e4a73465349711a9324767e1b2453383e2 (diff)
parent4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff)
downloadlinux-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.tar.xz
Merge branch 'core/percpu' into x86/core
Conflicts: kernel/irq/handle.c
Diffstat (limited to 'arch/x86/include/asm/apicnum.h')
-rw-r--r--arch/x86/include/asm/apicnum.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apicnum.h b/arch/x86/include/asm/apicnum.h
new file mode 100644
index 000000000000..82f613c607ce
--- /dev/null
+++ b/arch/x86/include/asm/apicnum.h
@@ -0,0 +1,12 @@
+#ifndef _ASM_X86_APICNUM_H
+#define _ASM_X86_APICNUM_H
+
+/* define MAX_IO_APICS */
+#ifdef CONFIG_X86_32
+# define MAX_IO_APICS 64
+#else
+# define MAX_IO_APICS 128
+# define MAX_LOCAL_APIC 32768
+#endif
+
+#endif /* _ASM_X86_APICNUM_H */