diff options
| author | Tejun Heo <tj@kernel.org> | 2011-01-23 08:37:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-28 08:54:04 -0500 |
| commit | b78aa66b1fe4179d28e3f6502dc179773519a1bb (patch) | |
| tree | f0d27cefdb94a2ad9ca269e2a554367276e8518c /arch/x86/mm | |
| parent | bd22a2f1982fa3e90ce7d5d011c37d88aa67e73c (diff) | |
x86: Drop x86_32 MAX_APICID
Commit 56d91f13 (x86, acpi: Add MAX_LOCAL_APIC for 32bit) added
MAX_LOCAL_APIC for x86_32 but didn't replace MAX_APICID users
with it. Convert MAX_APICID users to MAX_LOCAL_APIC and drop
MAX_APICID.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-3-git-send-email-tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/srat_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
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++){ |