Commit 7076cca9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a1362d50 15674868
...@@ -246,7 +246,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, ...@@ -246,7 +246,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type,
min(new_area_start, memblock.current_limit), min(new_area_start, memblock.current_limit),
new_alloc_size, PAGE_SIZE); new_alloc_size, PAGE_SIZE);
new_array = addr ? __va(addr) : 0; new_array = addr ? __va(addr) : NULL;
} }
if (!addr) { if (!addr) {
pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n", pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment