Fix voyager to boot again
PATCH 1/1 Fix voyager to boot again
The very early memory detection patch broke voyager.
This fixes it again.
James
===== arch/i386/Kconfig 1.108 vs edited =====
arch/i386/Kconfig +5 -0
@@ -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 =====
arch/i386/defconfig +1 -0
@@ -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 =====
arch/i386/kernel/Makefile +2 -1
@@ -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 =====
arch/i386/mach-voyager/voyager_smp.c +3 -1
@@ -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) {