diff options
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 0dd0c2c6cae0..5d701bf66a23 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1083,6 +1083,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
1083 | 1083 | ||
1084 | __supported_pte_mask |= _PAGE_IOMAP; | 1084 | __supported_pte_mask |= _PAGE_IOMAP; |
1085 | 1085 | ||
1086 | #ifdef CONFIG_X86_64 | ||
1087 | /* Work out if we support NX */ | ||
1088 | check_efer(); | ||
1089 | #endif | ||
1090 | |||
1086 | xen_setup_features(); | 1091 | xen_setup_features(); |
1087 | 1092 | ||
1088 | /* Get mfn list */ | 1093 | /* Get mfn list */ |
@@ -1123,11 +1128,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
1123 | 1128 | ||
1124 | pgd = (pgd_t *)xen_start_info->pt_base; | 1129 | pgd = (pgd_t *)xen_start_info->pt_base; |
1125 | 1130 | ||
1126 | #ifdef CONFIG_X86_64 | ||
1127 | /* Work out if we support NX */ | ||
1128 | check_efer(); | ||
1129 | #endif | ||
1130 | |||
1131 | /* Don't do the full vcpu_info placement stuff until we have a | 1131 | /* Don't do the full vcpu_info placement stuff until we have a |
1132 | possible map and a non-dummy shared_info. */ | 1132 | possible map and a non-dummy shared_info. */ |
1133 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; | 1133 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; |