summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAnton Arapov <anton@redhat.com>2012-09-17 10:22:51 +0200
committerAnton Arapov <anton@redhat.com>2012-09-17 10:22:51 +0200
commit4f87faf0a40754afe619316ef1e5980a1811d883 (patch)
treef180d9676de51ac3f4cc085cd715055dd81e19fc /mm
parent68b33af744b7b4d4f08a01088b0662373c2186d7 (diff)
downloadkernel-uprobes-4f87faf0a40754afe619316ef1e5980a1811d883.zip
kernel-uprobes-4f87faf0a40754afe619316ef1e5980a1811d883.tar.gz
kernel-uprobes-4f87faf0a40754afe619316ef1e5980a1811d883.tar.xz
fedora kernel: 5006e294cad99968b73c89679431ab73ec6bd0bav3.6.0-0.rc5.git3.1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c2
1 files changed, 1 insertions, 1 deletions
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",