From: Adrian Bunk <bunk@fs.tum.de>
To: Nick Piggin <piggin@cyberone.com.au>
Cc: Matt Mackall <mpm@selenic.com>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [3/4] proof of concept: make arch/i386/kernel/cpu/Makefile CPU specific
Date: Sat, 10 Jan 2004 01:57:54 +0100 [thread overview]
Message-ID: <20040110005754.GF25089@fs.tum.de> (raw)
In-Reply-To: <20040110004625.GB25089@fs.tum.de>
- make arch/i386/kernel/cpu/Makefile CPU specific
diffstat output:
arch/i386/kernel/cpu/Makefile | 34 +++++++++++++++++++++++++---------
arch/i386/kernel/cpu/common.c | 27 +++++++++++++++++++++++++++
arch/i386/mm/init.c | 6 +++++-
3 files changed, 57 insertions(+), 10 deletions(-)
--- linux-2.6.0-test5-mm4/arch/i386/kernel/cpu/Makefile.old 2003-09-25 14:35:17.000000000 +0200
+++ linux-2.6.0-test5-mm4/arch/i386/kernel/cpu/Makefile 2003-09-25 14:35:20.000000000 +0200
@@ -2,16 +2,32 @@
# Makefile for x86-compatible CPU details and quirks
#
-obj-y := common.o proc.o
+obj-y := common.o proc.o
+
+
+obj-$(CONFIG_CPU_486) += amd.o
+obj-$(CONFIG_CPU_586) += amd.o
+obj-$(CONFIG_CPU_K6) += amd.o
+obj-$(CONFIG_CPU_K7) += amd.o
+obj-$(CONFIG_CPU_K8) += amd.o
+
+obj-$(CONFIG_CPU_WINCHIP) += centaur.o
+obj-$(CONFIG_CPU_CYRIXIII) += centaur.o
+obj-$(CONFIG_CPU_VIAC3_2) += centaur.o
+
+obj-$(CONFIG_CPU_486) += cyrix.o
+obj-$(CONFIG_CPU_586) += cyrix.o
+
+obj-$(CONFIG_CPU_INTEL) += intel.o
+
+obj-$(CONFIG_CPU_586) += nexgen.o
+
+obj-$(CONFIG_CPU_586) += rise.o
+
+obj-$(CONFIG_CPU_CRUSOE) += transmeta.o
+
+obj-$(CONFIG_CPU_486) += umc.o
-obj-y += amd.o
-obj-y += cyrix.o
-obj-y += centaur.o
-obj-y += transmeta.o
-obj-y += intel.o
-obj-y += rise.o
-obj-y += nexgen.o
-obj-y += umc.o
obj-$(CONFIG_X86_MCE) += mcheck/
--- linux-2.6.0-test5-mm4/arch/i386/kernel/cpu/common.c.old 2003-09-25 14:35:17.000000000 +0200
+++ linux-2.6.0-test5-mm4/arch/i386/kernel/cpu/common.c 2003-09-25 14:35:20.000000000 +0200
@@ -434,15 +434,42 @@
void __init early_cpu_init(void)
{
+
+#if defined(CONFIG_CPU_INTEL)
intel_cpu_init();
+#endif
+
+#if defined(CONFIG_CPU_486) || defined(CONFIG_CPU_586)
cyrix_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_486)
nsc_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_486) || defined(CONFIG_CPU_586) || defined(CONFIG_CPU_K6) || defined(CONFIG_CPU_K7) || defined(CONFIG_CPU_K8)
amd_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_WINCHIP) || defined(CONFIG_CPU_CYRIXIII) || defined(CONFIG_CPU_VIAC3_2)
centaur_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_CRUSOE)
transmeta_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_586)
rise_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_586)
nexgen_init_cpu();
+#endif
+
+#if defined(CONFIG_CPU_486)
umc_init_cpu();
+#endif
#ifdef CONFIG_DEBUG_PAGEALLOC
/* pse is not compatible with on-the-fly unmapping,
--- linux-2.6.0-test5-mm4/arch/i386/mm/init.c.old 2003-09-25 14:35:17.000000000 +0200
+++ linux-2.6.0-test5-mm4/arch/i386/mm/init.c 2003-09-25 14:35:20.000000000 +0200
@@ -423,8 +423,12 @@
if (!mem_map)
BUG();
#endif
-
+
+#ifdef CONFIG_CPU_686
bad_ppro = ppro_with_ram_bug();
+#else
+ bad_ppro = 0;
+#endif
#ifdef CONFIG_HIGHMEM
/* check that fixmap and pkmap do not overlap */
next prev parent reply other threads:[~2004-01-10 0:58 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-06 5:48 2.6.1-rc1-tiny2 Matt Mackall
2004-01-06 6:33 ` 2.6.1-rc1-tiny2 Nick Piggin
2004-01-06 6:46 ` 2.6.1-rc1-tiny2 Matt Mackall
2004-01-06 7:08 ` 2.6.1-rc1-tiny2 Nick Piggin
2004-01-10 0:46 ` 2.6.1-rc1-tiny2 Adrian Bunk
2004-01-10 0:50 ` [0/4] better i386 CPU selection Adrian Bunk
2004-01-10 0:52 ` [1/4] " Adrian Bunk
2004-01-10 11:04 ` Wichert Akkerman
2004-01-11 3:13 ` Adrian Bunk
2004-01-14 20:49 ` [-mm patch] " Adrian Bunk
2004-01-16 19:15 ` [1/4] " cliff white
2004-01-16 19:32 ` Richard B. Johnson
2004-01-17 0:01 ` Andrew Morton
2004-01-17 2:57 ` Adrian Bunk
2004-01-19 15:14 ` John Stoffel
2004-01-19 23:42 ` Nick Piggin
2004-01-17 2:15 ` Adrian Bunk
2004-01-17 9:13 ` Robert Schwebel
2004-01-20 22:10 ` Adrian Bunk
2004-01-20 22:31 ` Richard B. Johnson
2004-01-20 22:47 ` George Anzinger
2004-01-17 10:01 ` aeriksson
2004-01-10 0:57 ` [2/4] move "struct movsl_mask movsl_mask" to usercopy.c Adrian Bunk
2004-01-10 0:57 ` Adrian Bunk [this message]
2004-01-10 0:58 ` [4/4] proof of concept: make arch/i386/kernel/cpu/mtrr/Makefile CPU specific Adrian Bunk
2004-01-10 22:14 ` 2.6.1-rc1-tiny2 Matt Mackall
2004-01-12 2:20 ` 2.6.1-rc1-tiny2 Nick Piggin
2004-01-07 14:06 ` 2.6.1-rc1-tiny2 Jens Axboe
2004-01-07 18:50 ` 2.6.1-rc1-tiny2 Matt Mackall
2004-01-07 19:27 ` 2.6.1-rc1-tiny2 Mitchell Blank Jr
2004-01-07 20:10 ` 2.6.1-rc1-tiny2 Matt Mackall
2004-01-07 21:41 ` 2.6.1-rc1-tiny2 Trond Myklebust
2004-01-07 21:10 ` 2.6.1-rc1-tiny2 Jens Axboe
2004-01-07 21:30 ` 2.6.1-rc1-tiny2 Matt Mackall
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=20040110005754.GF25089@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=piggin@cyberone.com.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.