diff options
| -rw-r--r-- | arch/x86/include/asm/mpspec.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/srat_32.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 0c90dd9f0505..edc2a455b726 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
| @@ -33,8 +33,6 @@ extern int mp_bus_id_to_local[MAX_MP_BUSSES]; | |||
| 33 | extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; | 33 | extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #define MAX_APICID 256 | ||
| 37 | |||
| 38 | #else /* CONFIG_X86_64: */ | 36 | #else /* CONFIG_X86_64: */ |
| 39 | 37 | ||
| 40 | #define MAX_MP_BUSSES 256 | 38 | #define MAX_MP_BUSSES 256 |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index ee9203a17d67..53a85baaecca 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | #include <asm/i8259.h> | 72 | #include <asm/i8259.h> |
| 73 | 73 | ||
| 74 | #ifdef CONFIG_X86_32 | 74 | #ifdef CONFIG_X86_32 |
| 75 | u8 apicid_2_node[MAX_APICID]; | 75 | u8 apicid_2_node[MAX_LOCAL_APIC]; |
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | /* State of each CPU */ | 78 | /* State of each CPU */ |
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index ae96e7b8051d..6027a4810003 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c | |||
| @@ -57,7 +57,7 @@ struct node_memory_chunk_s { | |||
| 57 | static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS]; | 57 | static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS]; |
| 58 | 58 | ||
| 59 | static int __initdata num_memory_chunks; /* total number of memory chunks */ | 59 | static int __initdata num_memory_chunks; /* total number of memory chunks */ |
| 60 | static u8 __initdata apicid_to_pxm[MAX_APICID]; | 60 | static u8 __initdata apicid_to_pxm[MAX_LOCAL_APIC]; |
| 61 | 61 | ||
| 62 | int acpi_numa __initdata; | 62 | int acpi_numa __initdata; |
| 63 | 63 | ||
| @@ -254,7 +254,7 @@ int __init get_memcfg_from_srat(void) | |||
| 254 | printk(KERN_DEBUG "Number of memory chunks in system = %d\n", | 254 | printk(KERN_DEBUG "Number of memory chunks in system = %d\n", |
| 255 | num_memory_chunks); | 255 | num_memory_chunks); |
| 256 | 256 | ||
| 257 | for (i = 0; i < MAX_APICID; i++) | 257 | for (i = 0; i < MAX_LOCAL_APIC; i++) |
| 258 | apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]); | 258 | apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]); |
| 259 | 259 | ||
| 260 | for (j = 0; j < num_memory_chunks; j++){ | 260 | for (j = 0; j < num_memory_chunks; j++){ |