diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-14 13:43:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-14 16:27:16 -0400 |
| commit | 632093b566569329bc6e5b0893bdca01de905314 (patch) | |
| tree | ddd8cb84789bf0bc60a566fd8d33ff138d6861e9 /arch/x86/include/asm/global_data.h | |
| parent | 61dfa65e405f2713dfc8090ed8147ec33b003717 (diff) | |
| parent | 236efe36be6d1c544f9477f10fdf38a17cd7a869 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include/asm/global_data.h')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index f7e3889df0..35148ab24e 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -10,6 +10,8 @@ #ifndef __ASSEMBLY__ +#include <asm/processor.h> + enum pei_boot_mode_t { PEI_BOOT_NONE = 0, PEI_BOOT_SOFT_RESET, @@ -44,6 +46,7 @@ struct mtrr_request { /* Architecture-specific global data */ struct arch_global_data { + u64 gdt[X86_GDT_NUM_ENTRIES] __aligned(16); struct global_data *gd_addr; /* Location of Global Data */ uint8_t x86; /* CPU family */ uint8_t x86_vendor; /* CPU vendor */ @@ -68,7 +71,6 @@ struct arch_global_data { /* MRC training data to save for the next boot */ char *mrc_output; unsigned int mrc_output_len; - void *gdt; /* Global descriptor table */ ulong table; /* Table pointer from previous loader */ }; |