From: Adrian Bunk <bunk@fs.tum.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [patch] 2.6.3-rc3-mm1: fix Pentium M patch
Date: Tue, 17 Feb 2004 19:26:15 +0100 [thread overview]
Message-ID: <20040217182615.GO1308@fs.tum.de> (raw)
In-Reply-To: <20040216015823.2dafabb4.akpm@osdl.org>
On Mon, Feb 16, 2004 at 01:58:23AM -0800, Andrew Morton wrote:
>...
> - Dropped the x86 CPU-type selection patches
>...
> Changes since 2.6.3-rc2-mm1:
>...
> -better-i386-cpu-selection.patch
> -cpu-options-default-to-y.patch
> -i386-default-to-n.patch
>
> Dropped
>...
This patch wasn't accepted when I sent the first versions against 2.5,
and now it's too late for 2.6...
Well, that's life. I understand your reasons and I'll resubmit it for
2.7 .
Removing the cpu selection patch uncovers a bug in my Pentium M I
already wanted to get a brown paperbag for.
Besides this, it seems a small part of the cpu selection patch was
actually in pentium-m-support.
The patch below resolves these two issues.
Please apply
Adrian
--- linux-2.6.3-rc3-mm1/arch/i386/Kconfig.old 2004-02-17 19:22:53.000000000 +0100
+++ linux-2.6.3-rc3-mm1/arch/i386/Kconfig 2004-02-17 19:23:28.000000000 +0100
@@ -348,8 +348,8 @@
int
default "7" if MPENTIUM4 || X86_GENERIC
default "4" if X86_ELAN || M486 || M386
- default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2
- default "6" if MK7 || MK8
+ default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2
+ default "6" if MK7 || MK8 || MPENTIUMM
config RWSEM_GENERIC_SPINLOCK
bool
--- linux-2.6.3-rc3-mm1/include/asm-i386/module.h.old 2004-02-17 19:24:18.000000000 +0100
+++ linux-2.6.3-rc3-mm1/include/asm-i386/module.h 2004-02-17 19:24:42.000000000 +0100
@@ -51,7 +51,7 @@
#elif defined CONFIG_MVIAC3_2
#define MODULE_PROC_FAMILY "VIAC3-2 "
#else
-#define MODULE_PROC_FAMILY "this needs to be fixed"
+#error unknown processor family
#endif
#ifdef CONFIG_REGPARM
prev parent reply other threads:[~2004-02-17 18:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-16 9:58 2.6.3-rc3-mm1 Andrew Morton
2004-02-16 11:39 ` 2.6.3-rc3-mm1 Krishnakumar. R
2004-02-16 12:16 ` 2.6.3-rc3-mm1 Bill Davidsen
2004-02-16 17:54 ` 2.6.3-rc3-mm1 Andrew Morton
2004-02-16 19:19 ` 2.6.3-rc3-mm1 Bill Davidsen
2004-02-16 21:12 ` 2.6.3-rc3-mm1 Zwane Mwaikambo
2004-02-16 21:29 ` 2.6.3-rc3-mm1 Andrew Morton
2004-02-17 21:26 ` 2.6.3-rc3-mm1 Zwane Mwaikambo
2004-02-16 19:23 ` 2.6.3-rc3-mm1 (compile stats) John Cherry
2004-02-17 18:26 ` Adrian Bunk [this message]
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=20040217182615.GO1308@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=akpm@osdl.org \
--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