[PATCH] Don't panic in mpparse on x86-64

From: Andi Kleen <ak@muc.de>

Merge i386 fix. Don't panic in MP table parsing when the table is bad.

diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 17ac22cee2ee3807801eac0802161782576704ec..b763140465f6ed72df7a3b1897b11165366187e5 100644 (file)
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -226,7 +226,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
        unsigned char *mpt=((unsigned char *)mpc)+count;
 
        if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) {
-               panic("SMP mptable: bad signature [%c%c%c%c]!\n",
+               printk("SMP mptable: bad signature [%c%c%c%c]!\n",
                        mpc->mpc_signature[0],
                        mpc->mpc_signature[1],
                        mpc->mpc_signature[2],
@@ -234,7 +234,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
                return 0;
        }
        if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
-               panic("SMP mptable: checksum error!\n");
+               printk("SMP mptable: checksum error!\n");
                return 0;
        }
        if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {