diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-24 14:42:13 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-24 14:42:13 -0400 |
| commit | 3fe05bd9980df7207a35b4841a94dc2875e86960 (patch) | |
| tree | b5bb9287088955d2b4b4552b4a4ca9c4c40769a4 /mm/memblock.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into devel-dt
Linux 3.6-rc6
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 4d9393c7edc9..82aa349d2f7a 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
| @@ -246,7 +246,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, | |||
| 246 | min(new_area_start, memblock.current_limit), | 246 | min(new_area_start, memblock.current_limit), |
| 247 | new_alloc_size, PAGE_SIZE); | 247 | new_alloc_size, PAGE_SIZE); |
| 248 | 248 | ||
| 249 | new_array = addr ? __va(addr) : 0; | 249 | new_array = addr ? __va(addr) : NULL; |
| 250 | } | 250 | } |
| 251 | if (!addr) { | 251 | if (!addr) { |
| 252 | pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n", | 252 | pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n", |