aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r--arch/i386/kernel/setup.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 4694ac980cd2..bd8c218d94af 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -60,6 +60,7 @@
60#include <asm/io_apic.h> 60#include <asm/io_apic.h>
61#include <asm/ist.h> 61#include <asm/ist.h>
62#include <asm/io.h> 62#include <asm/io.h>
63#include <asm/vmi.h>
63#include <setup_arch.h> 64#include <setup_arch.h>
64#include <bios_ebda.h> 65#include <bios_ebda.h>
65 66
@@ -581,6 +582,14 @@ void __init setup_arch(char **cmdline_p)
581 582
582 max_low_pfn = setup_memory(); 583 max_low_pfn = setup_memory();
583 584
585#ifdef CONFIG_VMI
586 /*
587 * Must be after max_low_pfn is determined, and before kernel
588 * pagetables are setup.
589 */
590 vmi_init();
591#endif
592
584 /* 593 /*
585 * NOTE: before this point _nobody_ is allowed to allocate 594 * NOTE: before this point _nobody_ is allowed to allocate
586 * any memory using the bootmem allocator. Although the 595 * any memory using the bootmem allocator. Although the