[i386] Remove bogus panic calls in mpparse.c

From: Herbert Xu <herbert@gondor.apana.org.au>
To: Linus Torvalds <torvalds@osdl.org>,
	Marcelo Tosatti <marcelo@conectiva.com.br>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [i386] Remove bogus panic calls in mpparse.c
Date: Thu, 13 Nov 2003 20:57:21 +1100	[thread overview]
Message-ID: <20031113095721.GB27003@gondor.apana.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

Hi:

This patch was based on a patch from Jochen Voss who owns a laptop
affected by this (http://seehuhn.de/comp/toshiba.html).

It replaces a couple of panic calls with printk instead.  They're
bogus because:

1. It's not fatal.
2. The user won't see it since the console hasn't initialised yet.

Cheers,
-- 
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[-- Attachment #2: p --]
[-- Type: text/plain, Size: 1059 bytes --]

Index: kernel-source-2.5/arch/i386/kernel/mpparse.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/arch/i386/kernel/mpparse.c,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 mpparse.c

--- kernel-source-2.5/arch/i386/kernel/mpparse.c	17 Oct 2003 21:43:00 -0000	1.1.1.15
+++ kernel-source-2.5/arch/i386/kernel/mpparse.c	13 Nov 2003 09:48:50 -0000
@@ -361,15 +361,12 @@
 	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",
-			mpc->mpc_signature[0],
-			mpc->mpc_signature[1],
-			mpc->mpc_signature[2],
-			mpc->mpc_signature[3]);
+		printk(KERN_ERR "SMP mptable: bad signature [0x%x]!\n",
+			*(u32 *)mpc->mpc_signature);
 		return 0;
 	}
 	if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
-		panic("SMP mptable: checksum error!\n");
+		printk(KERN_ERR "SMP mptable: checksum error!\n");
 		return 0;
 	}
 	if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {
