From 0422c17bd38d051497ff36fdf9f7f9975a3712e1 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 10 Sep 2012 12:49:57 +0800 Subject: [PATCH] --- yaml --- r: 326227 b: refs/heads/master c: 36a45e741783629e2c9039da51b95f637d56f875 h: refs/heads/master i: 326225: ccdd5e1bf0a77882edbf9425297a18b06de3ce19 326223: d1cff23a37517bb2948da540736278356e0dcbf4 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/machine_kexec.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0dc7edde6f7..971e1763d34b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cd10a60c3d0db95bc94073587725adc6c813cc3 +refs/heads/master: 36a45e741783629e2c9039da51b95f637d56f875 diff --git a/trunk/arch/ia64/kernel/machine_kexec.c b/trunk/arch/ia64/kernel/machine_kexec.c index 070e8effa175..5151a649c96b 100644 --- a/trunk/arch/ia64/kernel/machine_kexec.c +++ b/trunk/arch/ia64/kernel/machine_kexec.c @@ -85,12 +85,13 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) struct kimage *image = arg; relocate_new_kernel_t rnk; void *pal_addr = efi_get_pal_addr(); - unsigned long code_addr = (unsigned long)page_address(image->control_code_page); + unsigned long code_addr; int ii; u64 fp, gp; ia64_fptr_t *init_handler = (ia64_fptr_t *)ia64_os_init_on_kdump; BUG_ON(!image); + code_addr = (unsigned long)page_address(image->control_code_page); if (image->type == KEXEC_TYPE_CRASH) { crash_save_this_cpu(); current->thread.ksp = (__u64)info->sw - 16;