Commit 97c52a80 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] mpparse printk fix

From: Herbert Xu <herbert@gondor.apana.org.au>

The recent patch produces a message with no terminating newline on the
machine in question.  This is because one of the four bytes that you're
printing out is NUL.  The following patch avoids that problem.
parent 9069925a
...@@ -361,15 +361,12 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) ...@@ -361,15 +361,12 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
unsigned char *mpt=((unsigned char *)mpc)+count; unsigned char *mpt=((unsigned char *)mpc)+count;
if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) { if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) {
printk("SMP mptable: bad signature [%c%c%c%c]!\n", printk(KERN_ERR "SMP mptable: bad signature [0x%x]!\n",
mpc->mpc_signature[0], *(u32 *)mpc->mpc_signature);
mpc->mpc_signature[1],
mpc->mpc_signature[2],
mpc->mpc_signature[3]);
return 0; return 0;
} }
if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) { if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
printk("SMP mptable: checksum error!\n"); printk(KERN_ERR "SMP mptable: checksum error!\n");
return 0; return 0;
} }
if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) { if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment