diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-16 21:02:05 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-16 21:02:05 (GMT) |
commit | 638d957b51c88852de72f15f7cd588d125e97dab (patch) | |
tree | 84e9d6c7bb5416659e9015b60da3909751266c80 /arch/x86/include | |
parent | 137127018812ec7fcccb9843156cfc0b5cfa31d5 (diff) | |
download | linux-638d957b51c88852de72f15f7cd588d125e97dab.tar.xz |
x86, realmode: Change EFER to a single u64 field
Change EFER to be a single u64 field instead of two u32 fields; change
the order to maintain alignment. Note that on x86-64 cr4 is really
also a 64-bit quantity, although we can only set the low 32 bits from
the trampoline code since it is still executing in 32-bit mode at that
point.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/realmode.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index 937dc60..fce3f4a 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -35,9 +35,8 @@ struct trampoline_header { u32 gdt_base; #else u64 start; + u64 efer; u32 cr4; - u32 efer_low; - u32 efer_high; #endif }; |