diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 17:43:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 17:43:14 -0700 |
| commit | 7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a (patch) | |
| tree | 0bc442d3c96b2a65f0fb6f0267cd797c30ef46ed /mm | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | mm/memblock: Use NULL instead of 0 for pointers (diff) | |
| download | linux-dev-7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a.tar.xz linux-dev-7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a.zip | |
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, min(new_area_start, memblock.current_limit), new_alloc_size, PAGE_SIZE); - new_array = addr ? __va(addr) : 0; + new_array = addr ? __va(addr) : NULL; } if (!addr) { pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n", |