From bc84a72637cfe9c0f5e3d7f8f4aaad6083d6eb43 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 15 Dec 2012 20:59:07 -0800 Subject: [PATCH v7 03/29] x86: call copy_bootdata early real_mode_data aka zero_page could be above 4g. We will have #PF handler to set page table for not accessible ram early, but will only limit it before x86_64_start_reservations. Also we will need to ramdisk info to access microcode blob in ramdisk in x86_64_start_kernel. Signed-off-by: Yinghai Lu --- arch/x86/kernel/head64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 7b215a5..c0a25e0 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -87,6 +87,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"); @@ -95,7 +97,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), (unsigned long)__bss_stop - (unsigned long)_text); -- 1.7.10.4