|
@@ -604,6 +604,14 @@ void __init setup_arch(char **cmdline_p)
|
|
early_cpu_init();
|
|
early_cpu_init();
|
|
early_ioremap_init();
|
|
early_ioremap_init();
|
|
|
|
|
|
|
|
+#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
|
|
|
|
+ /*
|
|
|
|
+ * Must be before kernel pagetables are setup
|
|
|
|
+ * or fixmap area is touched.
|
|
|
|
+ */
|
|
|
|
+ vmi_init();
|
|
|
|
+#endif
|
|
|
|
+
|
|
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
|
|
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
|
|
screen_info = boot_params.screen_info;
|
|
screen_info = boot_params.screen_info;
|
|
edid_info = boot_params.edid_info;
|
|
edid_info = boot_params.edid_info;
|
|
@@ -817,14 +825,6 @@ void __init setup_arch(char **cmdline_p)
|
|
kvmclock_init();
|
|
kvmclock_init();
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
|
|
|
|
- /*
|
|
|
|
- * Must be after max_low_pfn is determined, and before kernel
|
|
|
|
- * pagetables are setup.
|
|
|
|
- */
|
|
|
|
- vmi_init();
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
paravirt_pagetable_setup_start(swapper_pg_dir);
|
|
paravirt_pagetable_setup_start(swapper_pg_dir);
|
|
paging_init();
|
|
paging_init();
|
|
paravirt_pagetable_setup_done(swapper_pg_dir);
|
|
paravirt_pagetable_setup_done(swapper_pg_dir);
|