lkml.org 
[lkml]   [2004]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: i386 very early memory detection cleanup patch breaks the build
From
Date
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) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:01    [W:0.039 / U:0.732 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site