diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2011-02-24 23:23:09 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-02 23:02:50 +0100 |
| commit | c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183 (patch) | |
| tree | 1a63a31822c30ba4788b396307e213268266c461 /arch/ia64/kernel | |
| parent | [IA64] setup.c Typo fix "Architechtuallly" (diff) | |
| download | linux-c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183.tar.xz linux-c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183.zip | |
[IA64] mca.c: Fix cast from integer to pointer warning
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>
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index e50d54e97f06..80d50b83d419 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -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); |