|
@@ -1259,10 +1259,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
|
|
|
*/
|
|
*/
|
|
|
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
|
|
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
|
|
|
|
|
|
|
|
- /* Work out if we support NX */
|
|
|
|
|
- get_cpu_cap(&boot_cpu_data);
|
|
|
|
|
- x86_configure_nx();
|
|
|
|
|
-
|
|
|
|
|
/* Get mfn list */
|
|
/* Get mfn list */
|
|
|
xen_build_dynamic_phys_to_machine();
|
|
xen_build_dynamic_phys_to_machine();
|
|
|
|
|
|
|
@@ -1272,6 +1268,10 @@ asmlinkage __visible void __init xen_start_kernel(void)
|
|
|
*/
|
|
*/
|
|
|
xen_setup_gdt(0);
|
|
xen_setup_gdt(0);
|
|
|
|
|
|
|
|
|
|
+ /* Work out if we support NX */
|
|
|
|
|
+ get_cpu_cap(&boot_cpu_data);
|
|
|
|
|
+ x86_configure_nx();
|
|
|
|
|
+
|
|
|
xen_init_irq_ops();
|
|
xen_init_irq_ops();
|
|
|
|
|
|
|
|
/* Let's presume PV guests always boot on vCPU with id 0. */
|
|
/* Let's presume PV guests always boot on vCPU with id 0. */
|