aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-17 15:08:55 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:08 -0400
commit864205062f1c752c80077be8ec2b15c81f4a6525 (patch)
treeb240a81db36c029ed6274f5775a05981d0b5816b /arch
parent0ec153af4dec8944e6da558093914a3bce4c76f9 (diff)
x86: make struct mpc_config_translation NUMAQ-only
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse_32.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index febd69dbbee9..15dd87110298 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -98,6 +98,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
98 return sum & 0xFF; 98 return sum & 0xFF;
99} 99}
100 100
101#ifdef CONFIG_X86_NUMAQ
101/* 102/*
102 * Have to match translation table entries to main table entries by counter 103 * Have to match translation table entries to main table entries by counter
103 * hence the mpc_record variable .... can't see a less disgusting way of 104 * hence the mpc_record variable .... can't see a less disgusting way of
@@ -106,6 +107,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
106 107
107static int mpc_record; 108static int mpc_record;
108static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata; 109static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata;
110#endif
109 111
110static void __cpuinit MP_processor_info (struct mpc_config_processor *m) 112static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
111{ 113{
@@ -475,7 +477,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
475 /* 477 /*
476 * Now process the configuration blocks. 478 * Now process the configuration blocks.
477 */ 479 */
480#ifdef CONFIG_X86_NUMAQ
478 mpc_record = 0; 481 mpc_record = 0;
482#endif
479 while (count < mpc->mpc_length) { 483 while (count < mpc->mpc_length) {
480 switch(*mpt) { 484 switch(*mpt) {
481 case MP_PROCESSOR: 485 case MP_PROCESSOR:
@@ -532,7 +536,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
532 break; 536 break;
533 } 537 }
534 } 538 }
539#ifdef CONFIG_X86_NUMAQ
535 ++mpc_record; 540 ++mpc_record;
541#endif
536 } 542 }
537 setup_apic_routing(); 543 setup_apic_routing();
538 if (!num_processors) 544 if (!num_processors)