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>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
index 1b9e1bc1ac5..bb360dc39d2 100644
--- a/arch/x86/realmode/rm/trampoline_64.S
+++ b/arch/x86/realmode/rm/trampoline_64.S
@@ -146,8 +146,8 @@ GLOBAL(trampoline_pgd)		.space	PAGE_SIZE
         .balign 8
 GLOBAL(trampoline_header)
         tr_start:               .space  8
-        GLOBAL(tr_cr4)          .space  4
         GLOBAL(tr_efer)         .space  8
+        GLOBAL(tr_cr4)          .space  4
 END(trampoline_header)
 
 #include "trampoline_common.S"