diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 20:43:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 20:43:14 -0400 |
| commit | 7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a (patch) | |
| tree | 0bc442d3c96b2a65f0fb6f0267cd797c30ef46ed /mm | |
| parent | a1362d504e26f32f853c65d0448ebc9ffb190f7d (diff) | |
| parent | 15674868d6c5985466835c56dd89d39235f16302 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull a core sparse warning fix from Ingo Molnar
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mm/memblock: Use NULL instead of 0 for pointers
Diffstat (limited to 'mm')
| -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", |