aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel V. Panteleev <pp_84@mail.ru>2010-06-17 04:07:25 -0400
committerTejun Heo <tj@kernel.org>2010-06-17 04:07:25 -0400
commita92d3ff9e5dbd958d8008a3e7a573e988e370ca3 (patch)
tree1fe26978d5ef6bbee063c3fb7b4e6b78280ab551
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
percpu: fix trivial bugs in pcpu_build_alloc_info()
Fix the following two trivial bugs in pcpu_build_alloc_info() * we should memset group_cnt to 0 by size of group_cnt, not size of group_map (both are of the same size, so the bug isn't dangerous) * we can delete useless variable group_cnt_max. Signed-off-by: Pavel V. Panteleev <pp_84@mail.ru> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--mm/percpu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 39f7dfd59585..46485e1b26fc 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1086,7 +1086,7 @@ struct pcpu_alloc_info * __init pcpu_build_alloc_info(
1086 static int group_map[NR_CPUS] __initdata; 1086 static int group_map[NR_CPUS] __initdata;
1087 static int group_cnt[NR_CPUS] __initdata; 1087 static int group_cnt[NR_CPUS] __initdata;
1088 const size_t static_size = __per_cpu_end - __per_cpu_start; 1088 const size_t static_size = __per_cpu_end - __per_cpu_start;
1089 int group_cnt_max = 0, nr_groups = 1, nr_units = 0; 1089 int nr_groups = 1, nr_units = 0;
1090 size_t size_sum, min_unit_size, alloc_size; 1090 size_t size_sum, min_unit_size, alloc_size;
1091 int upa, max_upa, uninitialized_var(best_upa); /* units_per_alloc */ 1091 int upa, max_upa, uninitialized_var(best_upa); /* units_per_alloc */
1092 int last_allocs, group, unit; 1092 int last_allocs, group, unit;
@@ -1096,7 +1096,7 @@ struct pcpu_alloc_info * __init pcpu_build_alloc_info(
1096 1096
1097 /* this function may be called multiple times */ 1097 /* this function may be called multiple times */
1098 memset(group_map, 0, sizeof(group_map)); 1098 memset(group_map, 0, sizeof(group_map));
1099 memset(group_cnt, 0, sizeof(group_map)); 1099 memset(group_cnt, 0, sizeof(group_cnt));
1100 1100
1101 /* 1101 /*
1102 * Determine min_unit_size, alloc_size and max_upa such that 1102 * Determine min_unit_size, alloc_size and max_upa such that
@@ -1130,7 +1130,6 @@ struct pcpu_alloc_info * __init pcpu_build_alloc_info(
1130 } 1130 }
1131 group_map[cpu] = group; 1131 group_map[cpu] = group;
1132 group_cnt[group]++; 1132 group_cnt[group]++;
1133 group_cnt_max = max(group_cnt_max, group_cnt[group]);
1134 } 1133 }
1135 1134
1136 /* 1135 /*