[IA64] mca.c: Fix cast from integer to pointer warning
authorJeff Mahoney <jeffm@suse.com>
Thu, 24 Feb 2011 22:23:09 +0000 (17:23 -0500)
committerTony Luck <tony.luck@intel.com>
Wed, 2 Mar 2011 22:02:50 +0000 (14:02 -0800)
ia64_mca_cpu_init has a void *data local variable that is assigned
the value from either __get_free_pages() or mca_bootmem(). The problem
is that __get_free_pages returns an unsigned long and mca_bootmem, via
alloc_bootmem(), returns a void *. format_mca_init_stack takes the void *,
and it's also used with __pa(), but that casts it to long anyway.

This results in the following build warning:

arch/ia64/kernel/mca.c:1898: warning: assignment makes pointer from
integer without a cast

Cast the return of __get_free_pages to a void * to avoid
the warning.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/mca.c

index e50d54e97f06afe853db6392bb1efa97b6d8f635..80d50b83d4192b434ff1e7216f7c1dc3864ec1e7 100644 (file)
@@ -1861,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data)
                        data = mca_bootmem();
                        first_time = 0;
                } else
-                       data = __get_free_pages(GFP_KERNEL, get_order(sz));
+                       data = (void *)__get_free_pages(GFP_KERNEL,
+                                                       get_order(sz));
                if (!data)
                        panic("Could not allocate MCA memory for cpu %d\n",
                                        cpu);