summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-09-21 23:34:45 -0400
committerTejun Heo <tj@kernel.org>2014-09-21 23:34:45 -0400
commitcbbe3a37a8b9cb3f1e86d82b5230344cf97124ef (patch)
tree1c769eee6b2f13485a4c3038d4eb15402ad77abf
parent1c50cef2a8555936020f8a2a622837bcf7b5825c (diff)
parentbb2e226b3bef596dd56be97df655d857b4603923 (diff)
Merge branch 'for-3.18' into for-next
-rw-r--r--mm/percpu.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index af3dd2704efd..e10f9f7a8887 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -2250,8 +2250,6 @@ void __init setup_per_cpu_areas(void)
if (pcpu_setup_first_chunk(ai, fc) < 0)
panic("Failed to initialize percpu areas.");
-
- pcpu_free_alloc_info(ai);
}
#endif /* CONFIG_SMP */