aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/mpparse.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 02eef8f6415f..20e88f4b564b 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -205,7 +205,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
205 unsigned char *mpt=((unsigned char *)mpc)+count; 205 unsigned char *mpt=((unsigned char *)mpc)+count;
206 206
207 if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) { 207 if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) {
208 printk("SMP mptable: bad signature [%c%c%c%c]!\n", 208 printk("MPTABLE: bad signature [%c%c%c%c]!\n",
209 mpc->mpc_signature[0], 209 mpc->mpc_signature[0],
210 mpc->mpc_signature[1], 210 mpc->mpc_signature[1],
211 mpc->mpc_signature[2], 211 mpc->mpc_signature[2],
@@ -213,31 +213,31 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
213 return 0; 213 return 0;
214 } 214 }
215 if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) { 215 if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
216 printk("SMP mptable: checksum error!\n"); 216 printk("MPTABLE: checksum error!\n");
217 return 0; 217 return 0;
218 } 218 }
219 if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) { 219 if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {
220 printk(KERN_ERR "SMP mptable: bad table version (%d)!!\n", 220 printk(KERN_ERR "MPTABLE: bad table version (%d)!!\n",
221 mpc->mpc_spec); 221 mpc->mpc_spec);
222 return 0; 222 return 0;
223 } 223 }
224 if (!mpc->mpc_lapic) { 224 if (!mpc->mpc_lapic) {
225 printk(KERN_ERR "SMP mptable: null local APIC address!\n"); 225 printk(KERN_ERR "MPTABLE: null local APIC address!\n");
226 return 0; 226 return 0;
227 } 227 }
228 memcpy(str,mpc->mpc_oem,8); 228 memcpy(str,mpc->mpc_oem,8);
229 str[8]=0; 229 str[8] = 0;
230 printk(KERN_INFO "OEM ID: %s ",str); 230 printk(KERN_INFO "MPTABLE: OEM ID: %s ",str);
231 231
232 memcpy(str,mpc->mpc_productid,12); 232 memcpy(str,mpc->mpc_productid,12);
233 str[12]=0; 233 str[12] = 0;
234 printk("Product ID: %s ",str); 234 printk("MPTABLE: Product ID: %s ",str);
235 235
236 printk("APIC at: 0x%X\n",mpc->mpc_lapic); 236 printk("MPTABLE: APIC at: 0x%X\n",mpc->mpc_lapic);
237 237
238 /* save the local APIC address, it might be non-default */ 238 /* save the local APIC address, it might be non-default */
239 if (!acpi_lapic) 239 if (!acpi_lapic)
240 mp_lapic_addr = mpc->mpc_lapic; 240 mp_lapic_addr = mpc->mpc_lapic;
241 241
242 /* 242 /*
243 * Now process the configuration blocks. 243 * Now process the configuration blocks.
@@ -249,7 +249,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
249 struct mpc_config_processor *m= 249 struct mpc_config_processor *m=
250 (struct mpc_config_processor *)mpt; 250 (struct mpc_config_processor *)mpt;
251 if (!acpi_lapic) 251 if (!acpi_lapic)
252 MP_processor_info(m); 252 MP_processor_info(m);
253 mpt += sizeof(*m); 253 mpt += sizeof(*m);
254 count += sizeof(*m); 254 count += sizeof(*m);
255 break; 255 break;
@@ -268,8 +268,8 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
268 struct mpc_config_ioapic *m= 268 struct mpc_config_ioapic *m=
269 (struct mpc_config_ioapic *)mpt; 269 (struct mpc_config_ioapic *)mpt;
270 MP_ioapic_info(m); 270 MP_ioapic_info(m);
271 mpt+=sizeof(*m); 271 mpt += sizeof(*m);
272 count+=sizeof(*m); 272 count += sizeof(*m);
273 break; 273 break;
274 } 274 }
275 case MP_INTSRC: 275 case MP_INTSRC:
@@ -278,8 +278,8 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
278 (struct mpc_config_intsrc *)mpt; 278 (struct mpc_config_intsrc *)mpt;
279 279
280 MP_intsrc_info(m); 280 MP_intsrc_info(m);
281 mpt+=sizeof(*m); 281 mpt += sizeof(*m);
282 count+=sizeof(*m); 282 count += sizeof(*m);
283 break; 283 break;
284 } 284 }
285 case MP_LINTSRC: 285 case MP_LINTSRC:
@@ -287,15 +287,15 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
287 struct mpc_config_lintsrc *m= 287 struct mpc_config_lintsrc *m=
288 (struct mpc_config_lintsrc *)mpt; 288 (struct mpc_config_lintsrc *)mpt;
289 MP_lintsrc_info(m); 289 MP_lintsrc_info(m);
290 mpt+=sizeof(*m); 290 mpt += sizeof(*m);
291 count+=sizeof(*m); 291 count += sizeof(*m);
292 break; 292 break;
293 } 293 }
294 } 294 }
295 } 295 }
296 clustered_apic_check(); 296 clustered_apic_check();
297 if (!num_processors) 297 if (!num_processors)
298 printk(KERN_ERR "SMP mptable: no processors registered!\n"); 298 printk(KERN_ERR "MPTABLE: no processors registered!\n");
299 return num_processors; 299 return num_processors;
300} 300}
301 301