Messages in this thread Patch in this message | | | Date | Fri, 14 Jun 2013 14:31:06 -0700 | From | tip-bot for Yinghai Lu <> | Subject | [tip:x86/mm] x86, microcode: Use common get_ramdisk_{image|size}( ) |
| |
Commit-ID: a795ab2d9c2113c63d2c9a0677012db13e746121 Gitweb: http://git.kernel.org/tip/a795ab2d9c2113c63d2c9a0677012db13e746121 Author: Yinghai Lu <yinghai@kernel.org> AuthorDate: Thu, 13 Jun 2013 21:02:49 +0800 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Fri, 14 Jun 2013 14:03:30 -0700
x86, microcode: Use common get_ramdisk_{image|size}()
In patch1, we change get_ramdisk_image() and get_ramdisk_size() to global, so we can use them instead of using global variable boot_params.
We need this to get correct ramdisk adress for 64bits bzImage that initrd can be loaded above 4G by kexec-tools.
-v2: fix one typo that is found by Tang Chen
Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1371128589-8953-3-git-send-email-tangchen@cn.fujitsu.com Cc: Fenghua Yu <fenghua.yu@intel.com> Acked-by: Tejun Heo <tj@kernel.org> Tested-by: Thomas Renninger <trenn@suse.de> Reviewed-by: Tang Chen <tangchen@cn.fujitsu.com> Tested-by: Tang Chen <tangchen@cn.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- arch/x86/kernel/microcode_intel_early.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/microcode_intel_early.c b/arch/x86/kernel/microcode_intel_early.c index 2e9e128..54575a9 100644 --- a/arch/x86/kernel/microcode_intel_early.c +++ b/arch/x86/kernel/microcode_intel_early.c @@ -743,8 +743,8 @@ load_ucode_intel_bsp(void) struct boot_params *boot_params_p; boot_params_p = (struct boot_params *)__pa_nodebug(&boot_params); - ramdisk_image = boot_params_p->hdr.ramdisk_image; - ramdisk_size = boot_params_p->hdr.ramdisk_size; + ramdisk_image = get_ramdisk_image(boot_params_p); + ramdisk_size = get_ramdisk_size(boot_params_p); initrd_start_early = ramdisk_image; initrd_end_early = initrd_start_early + ramdisk_size; @@ -753,8 +753,8 @@ load_ucode_intel_bsp(void) (unsigned long *)__pa_nodebug(&mc_saved_in_initrd), initrd_start_early, initrd_end_early, &uci); #else - ramdisk_image = boot_params.hdr.ramdisk_image; - ramdisk_size = boot_params.hdr.ramdisk_size; + ramdisk_image = get_ramdisk_image(&boot_params); + ramdisk_size = get_ramdisk_size(&boot_params); initrd_start_early = ramdisk_image + PAGE_OFFSET; initrd_end_early = initrd_start_early + ramdisk_size;
| |