Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

7076cca9 · Linus Torvalds <[email protected]> · 2012-09-14 17:43:14 -07:00

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

Commit: 7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a
Parents: a1362d50 · 15674868

Merge commit. Changes below are compared with the first parent: a1362d50.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
mm/memblock.c	modified	+1	−1	View file

mm/memblock.c

View file

diff --git a/mm/memblock.c b/mm/memblock.c
index 4d9393c..82aa349 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",