From: Andrew Hendry <andrew.hendry@gmail.com>
To: James.Bottomley@steeleye.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] mca: mca_pentium_flag no longer used
Date: Sun, 13 May 2007 22:09:41 +1000 [thread overview]
Message-ID: <20070513220941.8ff811ae.andrew.hendry@gmail.com> (raw)
Thanks James, hopefully have the mailer fixed now.
The check for mca_pentium_flag was removed long ago.
This cleans up the flag and documentation.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
diff -uprN -X dontdiff linux-2.6.21-vanilla/arch/i386/kernel/setup.c linux-2.6.21/arch/i386/kernel/setup.c
--- linux-2.6.21-vanilla/arch/i386/kernel/setup.c 2007-05-06 10:27:39.000000000 +1000
+++ linux-2.6.21/arch/i386/kernel/setup.c 2007-05-06 11:35:03.000000000 +1000
@@ -91,7 +91,6 @@ EXPORT_SYMBOL(machine_id);
#endif
unsigned int machine_submodel_id;
unsigned int BIOS_revision;
-unsigned int mca_pentium_flag;
/* Boot loader ID as an integer, for the benefit of proc_dointvec */
int bootloader_type;
diff -uprN -X dontdiff linux-2.6.21-vanilla/Documentation/kernel-parameters.txt linux-2.6.21/Documentation/kernel-parameters.txt
--- linux-2.6.21-vanilla/Documentation/kernel-parameters.txt 2007-05-06 10:27:37.000000000 +1000
+++ linux-2.6.21/Documentation/kernel-parameters.txt 2007-05-06 11:39:27.000000000 +1000
@@ -894,8 +894,6 @@ and is between 256 and 4096 characters.
[SCSI] Maximum number of LUNs received.
Should be between 1 and 16384.
- mca-pentium [BUGS=IA-32]
-
mcatest= [IA-64]
mcd= [HW,CD]
diff -uprN -X dontdiff linux-2.6.21-vanilla/include/asm-i386/bugs.h linux-2.6.21/include/asm-i386/bugs.h
--- linux-2.6.21-vanilla/include/asm-i386/bugs.h 2007-05-06 10:31:04.000000000 +1000
+++ linux-2.6.21/include/asm-i386/bugs.h 2007-05-06 11:35:39.000000000 +1000
@@ -31,14 +31,6 @@ static int __init no_halt(char *s)
__setup("no-hlt", no_halt);
-static int __init mca_pentium(char *s)
-{
- mca_pentium_flag = 1;
- return 1;
-}
-
-__setup("mca-pentium", mca_pentium);
-
static int __init no_387(char *s)
{
boot_cpu_data.hard_math = 0;
diff -uprN -X dontdiff linux-2.6.21-vanilla/include/asm-i386/processor.h linux-2.6.21/include/asm-i386/processor.h
--- linux-2.6.21-vanilla/include/asm-i386/processor.h 2007-05-06 10:31:05.000000000 +1000
+++ linux-2.6.21/include/asm-i386/processor.h 2007-05-06 11:35:19.000000000 +1000
@@ -264,7 +264,6 @@ others may find it useful. */
extern unsigned int machine_id;
extern unsigned int machine_submodel_id;
extern unsigned int BIOS_revision;
-extern unsigned int mca_pentium_flag;
/* Boot loader type from the setup header */
extern int bootloader_type;
next reply other threads:[~2007-05-13 12:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-13 12:09 Andrew Hendry [this message]
[not found] <d45a3acc0705070549ic3b11a5pc8c299e08f914835@mail.gmail.com>
2007-05-08 15:57 ` James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070513220941.8ff811ae.andrew.hendry@gmail.com \
--to=andrew.hendry@gmail.com \
--cc=James.Bottomley@steeleye.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome