From dcc5dcbad034225e497628c4ea7555cb2b286bee Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 24 Jan 2013 12:19:49 -0800 Subject: [PATCH] --- yaml --- r: 356233 b: refs/heads/master c: fa2bbce985ca97943305cdc81d9626e6810ed7f2 h: refs/heads/master i: 356231: 69c8d43d84ab50d402ffeedb7ace688087be9cf3 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head64.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3d3e8bcaf08d..470746084004 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aece27851d44bde62fc0587e06f5e8e27fd96e5f +refs/heads/master: fa2bbce985ca97943305cdc81d9626e6810ed7f2 diff --git a/trunk/arch/x86/kernel/head64.c b/trunk/arch/x86/kernel/head64.c index 849fc9e63c2f..7785e66840a4 100644 --- a/trunk/arch/x86/kernel/head64.c +++ b/trunk/arch/x86/kernel/head64.c @@ -89,6 +89,8 @@ void __init x86_64_start_kernel(char * real_mode_data) } load_idt((const struct desc_ptr *)&idt_descr); + copy_bootdata(__va(real_mode_data)); + if (console_loglevel == 10) early_printk("Kernel alive\n"); @@ -97,7 +99,9 @@ void __init x86_64_start_kernel(char * real_mode_data) void __init x86_64_start_reservations(char *real_mode_data) { - copy_bootdata(__va(real_mode_data)); + /* version is always not zero if it is copied */ + if (!boot_params.hdr.version) + copy_bootdata(__va(real_mode_data)); memblock_reserve(__pa_symbol(&_text), __pa_symbol(&__bss_stop) - __pa_symbol(&_text));