Commit 157cc3ee authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[PATCH] Fix voyager to boot again

The very early memory detection patch broke voyager.

This fixes it again.
parent 46385763
...@@ -1332,6 +1332,11 @@ config X86_BIOS_REBOOT ...@@ -1332,6 +1332,11 @@ config X86_BIOS_REBOOT
depends on !(X86_VISWS || X86_VOYAGER) depends on !(X86_VISWS || X86_VOYAGER)
default y default y
config X86_TRAMPOLINE
bool
depends on X86_SMP || (X86_VOYAGER && SMP)
default y
config PC config PC
bool bool
depends on X86 && !EMBEDDED depends on X86 && !EMBEDDED
......
...@@ -1212,4 +1212,5 @@ CONFIG_CRC32=y ...@@ -1212,4 +1212,5 @@ CONFIG_CRC32=y
CONFIG_X86_SMP=y CONFIG_X86_SMP=y
CONFIG_X86_HT=y CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_PC=y CONFIG_PC=y
...@@ -18,7 +18,8 @@ obj-$(CONFIG_X86_MSR) += msr.o ...@@ -18,7 +18,8 @@ obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_APM) += apm.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_MPPARSE) += mpparse.o
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o obj-$(CONFIG_X86_IO_APIC) += io_apic.o
......
...@@ -623,7 +623,9 @@ do_boot_cpu(__u8 cpu) ...@@ -623,7 +623,9 @@ do_boot_cpu(__u8 cpu)
((virt_to_phys(page_table_copies)) & PAGE_MASK) ((virt_to_phys(page_table_copies)) & PAGE_MASK)
| _PAGE_RW | _PAGE_USER | _PAGE_PRESENT; | _PAGE_RW | _PAGE_USER | _PAGE_PRESENT;
#else #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 #endif
if(quad_boot) { if(quad_boot) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment