diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 10:03:56 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 10:03:56 -0700 |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /mm/memblock.c | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 (diff) | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (diff) | |
| download | kernel_goldelico_gta04-593d1006cdf710ab3469c0c37c184fea0bc3da97.zip kernel_goldelico_gta04-593d1006cdf710ab3469c0c37c184fea0bc3da97.tar.gz kernel_goldelico_gta04-593d1006cdf710ab3469c0c37c184fea0bc3da97.tar.bz2 | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'mm/memblock.c')
| -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 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", |