diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-23 14:35:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-23 14:35:10 +0200 |
| commit | 14c93e8eba70c3c85d8f8acc6cfdc728aef92076 (patch) | |
| tree | d5575d386bca0237e91c0ec48be96925658005b7 /arch/x86/xen/enlighten.c | |
| parent | x86: mce, inject: Use real inject-msg in raise_local (diff) | |
| parent | x86: split NX setup into separate file to limit unstack-protected code (diff) | |
| download | linux-dev-14c93e8eba70c3c85d8f8acc6cfdc728aef92076.tar.xz linux-dev-14c93e8eba70c3c85d8f8acc6cfdc728aef92076.zip | |
Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/urgent
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -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 544eb7496531..3439616d69f1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1082,6 +1082,11 @@ asmlinkage void __init xen_start_kernel(void) __supported_pte_mask |= _PAGE_IOMAP; +#ifdef CONFIG_X86_64 + /* Work out if we support NX */ + check_efer(); +#endif + xen_setup_features(); /* Get mfn list */ @@ -1123,11 +1128,6 @@ asmlinkage void __init xen_start_kernel(void) pgd = (pgd_t *)xen_start_info->pt_base; -#ifdef CONFIG_X86_64 - /* Work out if we support NX */ - check_efer(); -#endif - /* Don't do the full vcpu_info placement stuff until we have a possible map and a non-dummy shared_info. */ per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; |