diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:41 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:39:42 -0500 |
| commit | 5a35e6c48e833366ea0099c0fffb63b368dba232 (patch) | |
| tree | ba2e1dc53fbd250d2a6bd61736a5b04e365eeb56 /arch/x86/cpu/cpu.c | |
| parent | 0cecc3b67938147bc9b9dfe55a8464b4dd4092de (diff) | |
| download | talos-obmc-uboot-5a35e6c48e833366ea0099c0fffb63b368dba232.tar.gz talos-obmc-uboot-5a35e6c48e833366ea0099c0fffb63b368dba232.zip | |
x86: Move gd_addr into arch_global_data
Move this field into arch_global_data and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add arch/x86/cpu/cpu.c changes after Graeme's comments]
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/x86/cpu/cpu.c')
| -rw-r--r-- | arch/x86/cpu/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 4902f8bccc..6a23974ff5 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -100,9 +100,9 @@ void setup_gdt(gd_t *id, u64 *gdt_addr) gdt_addr[X86_GDT_ENTRY_32BIT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff); /* FS: data, read/write, 4 GB, base (Global Data Pointer) */ - id->gd_addr = id; + id->arch.gd_addr = id; gdt_addr[X86_GDT_ENTRY_32BIT_FS] = GDT_ENTRY(0xc093, - (ulong)&id->gd_addr, 0xfffff); + (ulong)&id->arch.gd_addr, 0xfffff); /* 16-bit CS: code, read/execute, 64 kB, base 0 */ gdt_addr[X86_GDT_ENTRY_16BIT_CS] = GDT_ENTRY(0x109b, 0, 0x0ffff); |
