diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-10 12:49:57 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-09-10 14:31:23 -0700 |
| commit | 36a45e741783629e2c9039da51b95f637d56f875 (patch) | |
| tree | 68d103b717f4d17a98e838822f08ca1d3c96133e /arch/ia64/kernel/machine_kexec.c | |
| parent | 7cd10a60c3d0db95bc94073587725adc6c813cc3 (diff) | |
| download | talos-obmc-linux-36a45e741783629e2c9039da51b95f637d56f875.tar.gz talos-obmc-linux-36a45e741783629e2c9039da51b95f637d56f875.zip | |
[IA64] kexec: Move the dereference below the NULL test
The dereference should be moved below the NULL test.
spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/ia64/kernel/machine_kexec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c index 070e8effa175..5151a649c96b 100644 --- a/arch/ia64/kernel/machine_kexec.c +++ b/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; |
