OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a1362d5
)
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 15 Sep 2012 00:43:14 +0000
(17:43 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 15 Sep 2012 00:43:14 +0000
(17:43 -0700)
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
mm/memblock.c
patch
|
blob
|
history
diff --git
a/mm/memblock.c
b/mm/memblock.c
index
4d9393c
..
82aa349
100644
(file)
--- 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",