浏览代码

x86, acpi: Add MAX_LOCAL_APIC for 32bit

We should use MAX_LOCAL_APIC for max apic ids and MAX_APICS as number
of local apics.

Also apic_version[] array should use MAX_LOCAL_APICs.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4D0AD464.2020408@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Yinghai Lu 14 年之前
父节点
当前提交
56d91f132c
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      arch/x86/include/asm/apicdef.h
  2. 1 1
      arch/x86/include/asm/mpspec.h
  3. 1 1
      arch/x86/kernel/apic/apic.c

+ 1 - 0
arch/x86/include/asm/apicdef.h

@@ -145,6 +145,7 @@
 
 
 #ifdef CONFIG_X86_32
 #ifdef CONFIG_X86_32
 # define MAX_IO_APICS 64
 # define MAX_IO_APICS 64
+# define MAX_LOCAL_APIC 256
 #else
 #else
 # define MAX_IO_APICS 128
 # define MAX_IO_APICS 128
 # define MAX_LOCAL_APIC 32768
 # define MAX_LOCAL_APIC 32768

+ 1 - 1
arch/x86/include/asm/mpspec.h

@@ -6,7 +6,7 @@
 #include <asm/mpspec_def.h>
 #include <asm/mpspec_def.h>
 #include <asm/x86_init.h>
 #include <asm/x86_init.h>
 
 
-extern int apic_version[MAX_APICS];
+extern int apic_version[];
 extern int pic_mode;
 extern int pic_mode;
 
 
 #ifdef CONFIG_X86_32
 #ifdef CONFIG_X86_32

+ 1 - 1
arch/x86/kernel/apic/apic.c

@@ -1707,7 +1707,7 @@ void __init init_apic_mappings(void)
  * This initializes the IO-APIC and APIC hardware if this is
  * This initializes the IO-APIC and APIC hardware if this is
  * a UP kernel.
  * a UP kernel.
  */
  */
-int apic_version[MAX_APICS];
+int apic_version[MAX_LOCAL_APIC];
 
 
 int __init APIC_init_uniprocessor(void)
 int __init APIC_init_uniprocessor(void)
 {
 {