summaryrefslogtreecommitdiff
path: root/arch/x86/cpu/cpu.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-12-03 06:47:05 -0700
committerTom Rini <trini@ti.com>2012-12-03 06:47:05 -0700
commitce12a8c1a94a2b3d585feff387497f724b98e3ce (patch)
tree6e5db764e27df2465f5e4d9487c7561d14050064 /arch/x86/cpu/cpu.c
parentb04eb342af72d5dbcc29ccd7f3f9475044113361 (diff)
parent339c5111065c2b1893af1e4d6e9431b9496879a4 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/cpu.c')
-rw-r--r--arch/x86/cpu/cpu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 9c2db9f21e4..fabfbd1bf7f 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -115,6 +115,11 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
load_fs(X86_GDT_ENTRY_32BIT_FS);
}
+int __weak x86_cleanup_before_linux(void)
+{
+ return 0;
+}
+
int x86_cpu_init_f(void)
{
const u32 em_rst = ~X86_CR0_EM;