From: James Bottomley <James.Bottomley@steeleye.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@osdl.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: i386 very early memory detection cleanup patch breaks the build
Date: 13 Mar 2004 21:05:20 -0500 [thread overview]
Message-ID: <1079229921.2074.65.camel@mulgrave> (raw)
In-Reply-To: <40538B39.90803@zytor.com>
OK, I found it, it was a swapper_pg_dir replacement assumption that
breaks if pg0 isn't in the known location. Voyager still does odd
tricks with this because it also has a 486 SMP configuration (which I've
yet to test still boots...).
The attached patch fixes everything for me (do we agree on the
trampoline thing as the final form?)
James
===== arch/i386/Kconfig 1.108 vs edited =====
--- 1.108/arch/i386/Kconfig Fri Mar 12 03:33:00 2004
+++ edited/arch/i386/Kconfig Sat Mar 13 19:52:50 2004
@@ -1332,6 +1332,11 @@
depends on !(X86_VISWS || X86_VOYAGER)
default y
+config X86_TRAMPOLINE
+ bool
+ depends on X86_SMP || (X86_VOYAGER && SMP)
+ default y
+
config PC
bool
depends on X86 && !EMBEDDED
===== arch/i386/defconfig 1.107 vs edited =====
--- 1.107/arch/i386/defconfig Fri Mar 12 03:30:22 2004
+++ edited/arch/i386/defconfig Sat Mar 13 14:14:02 2004
@@ -1212,4 +1212,5 @@
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
CONFIG_PC=y
===== arch/i386/kernel/Makefile 1.56 vs edited =====
--- 1.56/arch/i386/kernel/Makefile Fri Mar 12 03:30:22 2004
+++ edited/arch/i386/kernel/Makefile Sat Mar 13 14:14:02 2004
@@ -18,7 +18,8 @@
obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_APM) += apm.o
-obj-$(CONFIG_X86_SMP) += smp.o smpboot.o trampoline.o
+obj-$(CONFIG_X86_SMP) += smp.o smpboot.o
+obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
===== arch/i386/mach-voyager/voyager_smp.c 1.18 vs edited =====
--- 1.18/arch/i386/mach-voyager/voyager_smp.c Mon Jan 19 00:32:52 2004
+++ edited/arch/i386/mach-voyager/voyager_smp.c Sat Mar 13 19:50:47 2004
@@ -623,7 +623,9 @@
((virt_to_phys(page_table_copies)) & PAGE_MASK)
| _PAGE_RW | _PAGE_USER | _PAGE_PRESENT;
#else
- ((unsigned long *)swapper_pg_dir)[0] = 0x102007;
+ ((unsigned long *)swapper_pg_dir)[0] =
+ (virt_to_phys(pg0) & PAGE_MASK)
+ | _PAGE_RW | _PAGE_USER | _PAGE_PRESENT;
#endif
if(quad_boot) {
next prev parent reply other threads:[~2004-03-14 2:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-13 17:15 i386 very early memory detection cleanup patch breaks the build James Bottomley
2004-03-13 19:48 ` James Bottomley
2004-03-13 21:43 ` H. Peter Anvin
2004-03-13 22:10 ` James Bottomley
2004-03-13 22:29 ` H. Peter Anvin
2004-03-13 22:38 ` James Bottomley
2004-03-14 2:05 ` James Bottomley [this message]
2004-03-14 2:16 ` H. Peter Anvin
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=1079229921.2074.65.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=akpm@osdl.org \
--cc=hpa@zytor.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 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.