]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[IA64] kexec: Move the dereference below the NULL test
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 10 Sep 2012 04:49:57 +0000 (12:49 +0800)
committerTony Luck <tony.luck@intel.com>
Mon, 10 Sep 2012 21:31:23 +0000 (14:31 -0700)
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>
arch/ia64/kernel/machine_kexec.c

index 070e8effa1757dcc75d6a6e400b5509d55abd4e5..5151a649c96ba0405bb21be344d79d600ff0b085 100644 (file)
@@ -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;