diff options
-rw-r--r-- | arch/x86/include/asm/apicdef.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/mpspec.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index a859ca461fb0..47a30ff8e517 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h | |||
@@ -145,6 +145,7 @@ | |||
145 | 145 | ||
146 | #ifdef CONFIG_X86_32 | 146 | #ifdef CONFIG_X86_32 |
147 | # define MAX_IO_APICS 64 | 147 | # define MAX_IO_APICS 64 |
148 | # define MAX_LOCAL_APIC 256 | ||
148 | #else | 149 | #else |
149 | # define MAX_IO_APICS 128 | 150 | # define MAX_IO_APICS 128 |
150 | # define MAX_LOCAL_APIC 32768 | 151 | # define MAX_LOCAL_APIC 32768 |
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index c82868e9f905..7c1aebf8fcbf 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <asm/mpspec_def.h> | 6 | #include <asm/mpspec_def.h> |
7 | #include <asm/x86_init.h> | 7 | #include <asm/x86_init.h> |
8 | 8 | ||
9 | extern int apic_version[MAX_APICS]; | 9 | extern int apic_version[]; |
10 | extern int pic_mode; | 10 | extern int pic_mode; |
11 | 11 | ||
12 | #ifdef CONFIG_X86_32 | 12 | #ifdef CONFIG_X86_32 |
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 463839645f9b..0d5d07f2253e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1707,7 +1707,7 @@ void __init init_apic_mappings(void) | |||
1707 | * This initializes the IO-APIC and APIC hardware if this is | 1707 | * This initializes the IO-APIC and APIC hardware if this is |
1708 | * a UP kernel. | 1708 | * a UP kernel. |
1709 | */ | 1709 | */ |
1710 | int apic_version[MAX_APICS]; | 1710 | int apic_version[MAX_LOCAL_APIC]; |
1711 | 1711 | ||
1712 | int __init APIC_init_uniprocessor(void) | 1712 | int __init APIC_init_uniprocessor(void) |
1713 | { | 1713 | { |