diff options
Diffstat (limited to 'arch/x86/lguest/boot.c')
-rw-r--r-- | arch/x86/lguest/boot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 5c7e2fd52075..e72cf0793fbe 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -835,7 +835,7 @@ static __init char *lguest_memory_setup(void) | |||
835 | 835 | ||
836 | /* The Linux bootloader header contains an "e820" memory map: the | 836 | /* The Linux bootloader header contains an "e820" memory map: the |
837 | * Launcher populated the first entry with our memory limit. */ | 837 | * Launcher populated the first entry with our memory limit. */ |
838 | add_memory_region(boot_params.e820_map[0].addr, | 838 | e820_add_region(boot_params.e820_map[0].addr, |
839 | boot_params.e820_map[0].size, | 839 | boot_params.e820_map[0].size, |
840 | boot_params.e820_map[0].type); | 840 | boot_params.e820_map[0].type); |
841 | 841 | ||
@@ -1012,6 +1012,7 @@ __init void lguest_init(void) | |||
1012 | * clobbered. The Launcher places our initial pagetables somewhere at | 1012 | * clobbered. The Launcher places our initial pagetables somewhere at |
1013 | * the top of our physical memory, so we don't need extra space: set | 1013 | * the top of our physical memory, so we don't need extra space: set |
1014 | * init_pg_tables_end to the end of the kernel. */ | 1014 | * init_pg_tables_end to the end of the kernel. */ |
1015 | init_pg_tables_start = __pa(pg0); | ||
1015 | init_pg_tables_end = __pa(pg0); | 1016 | init_pg_tables_end = __pa(pg0); |
1016 | 1017 | ||
1017 | /* Load the %fs segment register (the per-cpu segment register) with | 1018 | /* Load the %fs segment register (the per-cpu segment register) with |
@@ -1065,9 +1066,9 @@ __init void lguest_init(void) | |||
1065 | pm_power_off = lguest_power_off; | 1066 | pm_power_off = lguest_power_off; |
1066 | machine_ops.restart = lguest_restart; | 1067 | machine_ops.restart = lguest_restart; |
1067 | 1068 | ||
1068 | /* Now we're set up, call start_kernel() in init/main.c and we proceed | 1069 | /* Now we're set up, call i386_start_kernel() in head32.c and we proceed |
1069 | * to boot as normal. It never returns. */ | 1070 | * to boot as normal. It never returns. */ |
1070 | start_kernel(); | 1071 | i386_start_kernel(); |
1071 | } | 1072 | } |
1072 | /* | 1073 | /* |
1073 | * This marks the end of stage II of our journey, The Guest. | 1074 | * This marks the end of stage II of our journey, The Guest. |