diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
| commit | ca1841de3a426de8cfac6ca61f0f54e6283d0653 (patch) | |
| tree | fc9ca7db1f9ada5301b3684ae75cfe8470071425 /arch/ia64/kernel | |
| parent | c5325bf1df96152c969b44cae2b8131be5621c47 (diff) | |
| parent | 8fd62c82872a5a721c9fb0071ca0f7a49c1732e4 (diff) | |
Merge commit 'v2.6.38.4' into linaro-2.6.38
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 1753f6a30d5..ff14ab26c50 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -1859,7 +1859,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); |