diff options
| author | Keir Fraser <keir@xen.org> | 2012-09-12 13:59:26 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2012-09-12 13:59:26 +0100 |
| commit | 218adf199e6868eb4a15644a63e6991ede1613bc (patch) | |
| tree | faa5070fb10dee2354b8c753385e10fc32668a2d /xen/arch/x86/boot/trampoline.S | |
| parent | 5d1181a5ea5e0f11d481a94b16ed00d883f9726e (diff) | |
| download | xen-218adf199e6868eb4a15644a63e6991ede1613bc.tar.gz xen-218adf199e6868eb4a15644a63e6991ede1613bc.tar.bz2 xen-218adf199e6868eb4a15644a63e6991ede1613bc.zip | |
x86: We can assume CONFIG_PAGING_LEVELS==4.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/boot/trampoline.S')
| -rw-r--r-- | xen/arch/x86/boot/trampoline.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index df1d45950a..f84ce2a0f5 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -94,10 +94,8 @@ trampoline_protmode_entry: jz .Lskip_efer movl $MSR_EFER,%ecx rdmsr -#if CONFIG_PAGING_LEVELS == 4 btsl $_EFER_LME,%eax /* Long Mode */ btsl $_EFER_SCE,%eax /* SYSCALL/SYSRET */ -#endif btl $20,%edi /* No Execute? */ jnc 1f btsl $_EFER_NX,%eax /* No Execute */ |